diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-21 09:18:42 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-21 09:18:42 -0500 |
| commit | d3de40a14f4ad1feb001386a4cfbbc837314e37b (patch) | |
| tree | 8730afc1433430ea3b716e4a0568fe321a33b655 | |
| parent | c6d763c2fa431fefd0869d381b15c25364e8972f (diff) | |
| parent | 4234bd3c279346274d5acabc24a869c596a3e1e7 (diff) | |
| download | libayatana-indicator-d3de40a14f4ad1feb001386a4cfbbc837314e37b.tar.gz libayatana-indicator-d3de40a14f4ad1feb001386a4cfbbc837314e37b.tar.bz2 libayatana-indicator-d3de40a14f4ad1feb001386a4cfbbc837314e37b.zip | |
Adding in secondary activate support
| -rw-r--r-- | libindicator/indicator-object.c | 21 | ||||
| -rw-r--r-- | libindicator/indicator-object.h | 5 |
2 files changed, 23 insertions, 3 deletions
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a563ebe..bd056f0 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -63,6 +63,7 @@ enum { MENU_SHOW, SHOW_NOW_CHANGED, ACCESSIBLE_DESC_UPDATE, + SECONDARY_ACTIVATE, LAST_SIGNAL }; @@ -149,8 +150,7 @@ indicator_object_class_init (IndicatorObjectClass *klass) NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT_UINT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE); - -/** + /** IndicatorObject::entry-scrolled: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that @@ -169,6 +169,23 @@ indicator_object_class_init (IndicatorObjectClass *klass) _indicator_object_marshal_VOID__POINTER_UINT_ENUM, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION); + /** + IndicatorObject::secondary-activate: + @arg0: The #IndicatorObject object + @arg1: A pointer to the #IndicatorObjectEntry that + receives the secondary activate event. + @arg2: The timestamp of the event + + When the indicator receives a secondary activation event + from the user, this signal is emitted. + */ + signals[SECONDARY_ACTIVATE] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicatorObjectClass, secondary_activate), + NULL, NULL, + _indicator_object_marshal_VOID__POINTER_UINT, + G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT); /** IndicatorObject::menu-show: diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index a285949..3a120f5 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -57,6 +57,8 @@ typedef enum #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE "accessible-desc-update" #define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, INDICATOR_OBJECT_TYPE)) +#define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE "secondary-activate" +#define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, INDICATOR_OBJECT_TYPE)) typedef struct _IndicatorObject IndicatorObject; typedef struct _IndicatorObjectClass IndicatorObjectClass; @@ -99,6 +101,7 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry; @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 + @secondary_activate: Slot for #IndicatorObject::secondary-activate */ struct _IndicatorObjectClass { GObjectClass parent_class; @@ -125,6 +128,7 @@ struct _IndicatorObjectClass { 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 (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); + void (*secondary_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); /* Reserved */ void (*reserved1) (void); @@ -132,7 +136,6 @@ struct _IndicatorObjectClass { void (*reserved3) (void); void (*reserved4) (void); void (*reserved5) (void); - void (*reserved6) (void); }; /** |