aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-object.c
diff options
context:
space:
mode:
authorLuke Yelavich <luke.yelavich@canonical.com>2011-02-01 17:37:15 +1100
committerLuke Yelavich <luke.yelavich@canonical.com>2011-02-01 17:37:15 +1100
commitd50d1bb0886d104ffd077956bdf651cd3a3d1af4 (patch)
treedc015117ac2da736ba0361cbe98b3827dd7dae7e /libindicator/indicator-object.c
parent9215e19e801f59a2abd4dd92563cfe50f366f635 (diff)
parent9ac551998017804c2e9024d22d809e22a63987ce (diff)
downloadlibayatana-indicator-d50d1bb0886d104ffd077956bdf651cd3a3d1af4.tar.gz
libayatana-indicator-d50d1bb0886d104ffd077956bdf651cd3a3d1af4.tar.bz2
libayatana-indicator-d50d1bb0886d104ffd077956bdf651cd3a3d1af4.zip
Merge from trunk
Diffstat (limited to 'libindicator/indicator-object.c')
-rw-r--r--libindicator/indicator-object.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index c190cd7..58952d7 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -58,6 +58,7 @@ enum {
ENTRY_REMOVED,
ENTRY_MOVED,
SCROLL,
+ SCROLL_ENTRY,
MENU_SHOW,
SHOW_NOW_CHANGED,
LAST_SIGNAL
@@ -147,7 +148,6 @@ indicator_object_class_init (IndicatorObjectClass *klass)
_indicator_object_marshal_VOID__POINTER_UINT_UINT,
G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE);
-
/**
IndicatorObject::scroll:
@arg0: The #IndicatorObject object
@@ -163,7 +163,28 @@ indicator_object_class_init (IndicatorObjectClass *klass)
G_STRUCT_OFFSET (IndicatorObjectClass, scroll),
NULL, NULL,
_indicator_object_marshal_VOID__UINT_ENUM,
- G_TYPE_NONE, 2, G_TYPE_UINT, INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
+ G_TYPE_NONE, 2, G_TYPE_UINT,
+ INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
+
+/**
+ IndicatorObject::scroll-entry:
+ @arg0: The #IndicatorObject object
+ @arg1: A pointer to the #IndicatorObjectEntry that
+ receives the scroll event.
+ @arg2: The delta of the scroll event
+ @arg3: The orientation of the scroll event.
+
+ When the indicator receives a mouse scroll wheel event
+ from the user, this signal is emitted.
+ */
+ signals[SCROLL_ENTRY] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY,
+ G_TYPE_FROM_CLASS(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (IndicatorObjectClass, scroll_entry),
+ NULL, NULL,
+ _indicator_object_marshal_VOID__POINTER_UINT_ENUM,
+ G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT,
+ INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
/**
IndicatorObject::menu-show: