From 4adb9ab724e53a65603fe53abbb96304a8cab260 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 15 Mar 2010 14:12:20 -0500 Subject: Add 'scroll' signal. --- libindicator/indicator-object.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'libindicator/indicator-object.c') diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 87cd648..a905cb8 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -56,6 +56,7 @@ enum { ENTRY_ADDED, ENTRY_REMOVED, ENTRY_MOVED, + SCROLL, LAST_SIGNAL }; @@ -142,6 +143,25 @@ 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 + @arg1: The delta of the scroll event + @arg2: The orientation of the scroll event. %TRUE indicates up, %FALSE down. + + When the indicator receives a mouse scroll wheel event + from the user, this signal is emitted. + */ + signals[SCROLL] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL, + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicatorObjectClass, scroll), + NULL, NULL, + _indicator_object_marshal_VOID__UINT_BOOL, + G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_BOOLEAN); + + return; } @@ -188,7 +208,7 @@ static void indicator_object_finalize (GObject *object) { IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object); - + if (priv->module != NULL) { /* Wow, this is convoluted. So basically we want to unref the module which will cause the code it included to be @@ -211,7 +231,7 @@ indicator_object_finalize (GObject *object) This function builds an #IndicatorObject using the symbols that are found in @file. The module is loaded and the - references are all kept by the object. To unload the + references are all kept by the object. To unload the module the object must be destroyed. Return value: A valid #IndicatorObject or #NULL if error. @@ -304,7 +324,7 @@ unrefandout: /* The default get entries function uses the other single entries in the class to create an entry structure and put it into a list. This makes it simple for simple objects - to create the list. Small changes from the way they + to create the list. Small changes from the way they previously were. */ static GList * get_entries_default (IndicatorObject * io) -- cgit v1.2.3 From 02d3dde87c8fcf2702741ab265dbaa24d498cd51 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Tue, 16 Mar 2010 11:40:14 -0500 Subject: Define IndicatorScrollDirection enum for scroll signal parameter. --- libindicator/indicator-object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libindicator/indicator-object.c') diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a905cb8..c3e0139 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -28,6 +28,7 @@ License along with this library. If not, see #include "indicator.h" #include "indicator-object.h" #include "indicator-object-marshal.h" +#include "indicator-object-enum-types.h" /** IndicatorObjectPrivate: @@ -158,8 +159,8 @@ indicator_object_class_init (IndicatorObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, scroll), NULL, NULL, - _indicator_object_marshal_VOID__UINT_BOOL, - G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_BOOLEAN); + _indicator_object_marshal_VOID__UINT_ENUM, + G_TYPE_NONE, 2, G_TYPE_UINT, INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION); return; -- cgit v1.2.3 From b782a8a4eaae520a0d4b3fffef466205d3df9c28 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Wed, 17 Mar 2010 01:14:13 -0500 Subject: Documentation fix. --- libindicator/indicator-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libindicator/indicator-object.c') diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index c3e0139..511a407 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -149,7 +149,7 @@ indicator_object_class_init (IndicatorObjectClass *klass) IndicatorObject::scroll: @arg0: The #IndicatorObject object @arg1: The delta of the scroll event - @arg2: The orientation of the scroll event. %TRUE indicates up, %FALSE down. + @arg2: The orientation of the scroll event. When the indicator receives a mouse scroll wheel event from the user, this signal is emitted. -- cgit v1.2.3