From 4234bd3c279346274d5acabc24a869c596a3e1e7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Jul 2011 09:17:41 -0500 Subject: Dropping the x and y paramaters from the secondary activate signal --- libindicator/indicator-object-marshal.list | 1 - libindicator/indicator-object.c | 7 ++----- libindicator/indicator-object.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libindicator/indicator-object-marshal.list b/libindicator/indicator-object-marshal.list index d0b0437..4896ac4 100644 --- a/libindicator/indicator-object-marshal.list +++ b/libindicator/indicator-object-marshal.list @@ -2,4 +2,3 @@ VOID: POINTER, UINT, UINT VOID: POINTER, UINT, ENUM VOID: POINTER, UINT VOID: POINTER, BOOLEAN -VOID: POINTER, UINT, INT, INT diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 04809f1..ad74c79 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -175,8 +175,6 @@ indicator_object_class_init (IndicatorObjectClass *klass) @arg1: A pointer to the #IndicatorObjectEntry that receives the secondary activate event. @arg2: The timestamp of the event - @arg3: The X position of the pointer - @arg4: The Y position of the pointer When the indicator receives a secondary activation event from the user, this signal is emitted. @@ -186,9 +184,8 @@ indicator_object_class_init (IndicatorObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, secondary_activate), NULL, NULL, - _indicator_object_marshal_VOID__POINTER_UINT_INT_INT, - G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_UINT, - G_TYPE_INT, G_TYPE_INT); + _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 097b4a1..3a120f5 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -128,7 +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, gint x, gint y, gpointer user_data); + void (*secondary_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); /* Reserved */ void (*reserved1) (void); -- cgit v1.2.3