diff options
author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-07-02 04:13:05 +0200 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-07-02 04:13:05 +0200 |
commit | 8881229ab3af6dfd5a23f33357c0ef466aa7fd85 (patch) | |
tree | 1213750e363f8a5f52fc82a88f6f78401b8322d8 /libindicator/indicator-object.c | |
parent | 5fdfbbecdd677477555164e347406bf3bc9b624a (diff) | |
download | libayatana-indicator-8881229ab3af6dfd5a23f33357c0ef466aa7fd85.tar.gz libayatana-indicator-8881229ab3af6dfd5a23f33357c0ef466aa7fd85.tar.bz2 libayatana-indicator-8881229ab3af6dfd5a23f33357c0ef466aa7fd85.zip |
Merging "scroll" and "scroll-entry" into the "entry-scrolled" signal
API change to merge the duplication of signals, as defined in
the blueprint desktop-dx-o-indicators-review
Diffstat (limited to 'libindicator/indicator-object.c')
-rw-r--r-- | libindicator/indicator-object.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a061215..a91251c 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -59,8 +59,7 @@ enum { ENTRY_ADDED, ENTRY_REMOVED, ENTRY_MOVED, - SCROLL, - SCROLL_ENTRY, + ENTRY_SCROLLED, MENU_SHOW, SHOW_NOW_CHANGED, ACCESSIBLE_DESC_UPDATE, @@ -151,26 +150,8 @@ 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. - - 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_ENUM, - G_TYPE_NONE, 2, G_TYPE_UINT, - INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION); - /** - IndicatorObject::scroll-entry: + IndicatorObject::entry-scrolled: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that receives the scroll event. @@ -180,10 +161,10 @@ indicator_object_class_init (IndicatorObjectClass *klass) 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, + signals[ENTRY_SCROLLED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (IndicatorObjectClass, scroll_entry), + G_STRUCT_OFFSET (IndicatorObjectClass, entry_scrolled), NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT_ENUM, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, |