diff options
| author | Ted Gould <ted@gould.cx> | 2010-09-14 10:53:40 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-09-14 10:53:40 -0500 |
| commit | 4e26272abb5a9722371a98449fd2d4e05bf0d232 (patch) | |
| tree | d2badfe07c2ed0e97b271c448495f1de59f5f7ae /libindicator/indicator-object.h | |
| parent | 8839b12e3deb35d69a61edc87d0d8649b6459132 (diff) | |
| parent | f0cd0042e672c6d7c230aea322ff3fb868237ea6 (diff) | |
| download | libayatana-indicator-4e26272abb5a9722371a98449fd2d4e05bf0d232.tar.gz libayatana-indicator-4e26272abb5a9722371a98449fd2d4e05bf0d232.tar.bz2 libayatana-indicator-4e26272abb5a9722371a98449fd2d4e05bf0d232.zip | |
* Upstream Merge
* Adding a menu_show signal
Diffstat (limited to 'libindicator/indicator-object.h')
| -rw-r--r-- | libindicator/indicator-object.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index 3c6bec5..32a35f9 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -51,6 +51,8 @@ typedef enum #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_MENU_SHOW "menu-show" +#define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE)) typedef struct _IndicatorObject IndicatorObject; typedef struct _IndicatorObjectClass IndicatorObjectClass; @@ -79,8 +81,7 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry; @entry_added: Slot for #IndicatorObject::entry-added @entry_removed: Slot for #IndicatorObject::entry-removed @entry_moved: Slot for #IndicatorObject::entry-moved - @indicator_object_reserved_1: Reserved for future use - @indicator_object_reserved_2: Reserved for future use + @menu_show: Slot for #IndicatorObject::menu-show */ struct _IndicatorObjectClass { GObjectClass parent_class; @@ -94,13 +95,13 @@ struct _IndicatorObjectClass { guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry); /* Signals */ - 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_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 (*menu_show) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); /* Reserved */ - void (* indicator_object_reserved_1) (void); }; /** |