aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-object.h
diff options
context:
space:
mode:
authorLuke Yelavich <luke.yelavich@canonical.com>2011-02-01 17:37:15 +1100
committerLuke Yelavich <luke.yelavich@canonical.com>2011-02-01 17:37:15 +1100
commitd50d1bb0886d104ffd077956bdf651cd3a3d1af4 (patch)
treedc015117ac2da736ba0361cbe98b3827dd7dae7e /libindicator/indicator-object.h
parent9215e19e801f59a2abd4dd92563cfe50f366f635 (diff)
parent9ac551998017804c2e9024d22d809e22a63987ce (diff)
downloadlibayatana-indicator-d50d1bb0886d104ffd077956bdf651cd3a3d1af4.tar.gz
libayatana-indicator-d50d1bb0886d104ffd077956bdf651cd3a3d1af4.tar.bz2
libayatana-indicator-d50d1bb0886d104ffd077956bdf651cd3a3d1af4.zip
Merge from trunk
Diffstat (limited to 'libindicator/indicator-object.h')
-rw-r--r--libindicator/indicator-object.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index a2736d3..ea303f8 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_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_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"
@@ -116,6 +118,7 @@ struct _IndicatorObjectClass {
void (*scroll) (IndicatorObject * io, 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);
/* Reserved */
void (*reserved1) (void);
@@ -123,7 +126,6 @@ struct _IndicatorObjectClass {
void (*reserved3) (void);
void (*reserved4) (void);
void (*reserved5) (void);
- void (*reserved6) (void);
};
/**