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.h | |
| 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.h')
| -rw-r--r-- | libindicator/indicator-object.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index aa15c79..5faeff5 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -49,10 +49,8 @@ typedef enum #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved" #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE)) -#define INDICATOR_OBJECT_SIGNAL_SCROLL "scroll" -#define INDICATOR_OBJECT_SIGNAL_SCROLL_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SCROLL, INDICATOR_OBJECT_TYPE)) -#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY "scroll-entry" -#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY_ID (g_signal_lookup(#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY, INDICATOR_OBJECT_TYPE)) +#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "entry-scrolled" +#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW "menu-show" #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed" @@ -96,6 +94,7 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry; @entry_removed: Slot for #IndicatorObject::entry-removed @entry_moved: Slot for #IndicatorObject::entry-moved @menu_show: Slot for #IndicatorObject::menu-show + @entry_scrolled: Slot for #IndicatorObject::entry-scrolled @show_now_changed: Slot for #IndicatorObject::show-now-changed @accessible_desc_update: Slot for #IndicatorObject::accessible-desc-update */ @@ -119,10 +118,9 @@ struct _IndicatorObjectClass { void (*entry_added) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*entry_moved) (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data); - void (*scroll) (IndicatorObject * io, gint delta, IndicatorScrollDirection direction); + void (*entry_scrolled) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); void (*menu_show) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); void (*show_now_changed) (IndicatorObject * io, IndicatorObjectEntry * entry, gboolean show_now_state, gpointer user_data); - void (*scroll_entry) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); void (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); /* Reserved */ |