Merge lp:~3v1n0/libindicator/secondary-activate-support into lp:libindicator/0.4

[Marco Trevisan (Treviño)]

Add support to "secondary-activate" event, needed by both bug #609860 and bug #812933. See the latest for more informations.

[Ted Gould (ted)]

It seems to me that there isn't a reason we need the X and Y information. The only reason that'd be useful is to present a menu, which is something we don't want people to do.

[Marco Trevisan (Treviño) (3v1n0)]

I've explained the reason in the bug report, the fact is that the StatusNotifierItem SecondaryActivate method needs these values [1], and I export them to follow that specification.

[1] http://www.notmart.org/misc/statusnotifieritem/statusnotifieritem.html#SecondaryActivate

[Ted Gould (ted)]

While, in general, I think that we should work towards matching the SNI spec, I think that this is an exception. The behavior that we're going to get is applications that use this signal in a way that we're not comfortable with will work poorly on Ubuntu and ruin the overall experience. We have no way to detect what the application is going to do with the signal, so we must error on the side of not sending it.

[Ted Gould (ted)]

To be clear, in libappindicator we can accept it an use it like the other signals. But we should not send it from indicator-application.

[Marco Trevisan (Treviño) (3v1n0)]

In libappindicator we're not using a signal anymore... In indicator-application we're using that value for sending the right SecondaryActivate method, I guess it's needed by non-ubuntu indicators (for kde apps ones?)

=== modified file 'libindicator/indicator-object-marshal.list'
--- libindicator/indicator-object-marshal.list	2011-07-02 02:13:05 +0000
+++ libindicator/indicator-object-marshal.list	2011-07-19 15:05:07 +0000
@@ -2,3 +2,4 @@
 VOID: POINTER, UINT, ENUM
 VOID: POINTER, UINT
 VOID: POINTER, BOOLEAN
+VOID: POINTER, UINT, INT, INT
 
=== modified file 'libindicator/indicator-object.c'
--- libindicator/indicator-object.c	2011-07-08 00:39:59 +0000
+++ libindicator/indicator-object.c	2011-07-19 15:05:07 +0000
@@ -63,6 +63,7 @@
 	MENU_SHOW,
 	SHOW_NOW_CHANGED,
 	ACCESSIBLE_DESC_UPDATE,
+	SECONDARY_ACTIVATE,
 	LAST_SIGNAL
 };
 
@@ -149,8 +150,7 @@
 	                                     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,26 @@
 	                                _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
+		@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.
+	*/
+	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_INT_INT,
+	                                G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_UINT,
+	                                G_TYPE_INT, G_TYPE_INT);
 
 	/**
 		IndicatorObject::menu-show:
 
=== modified file 'libindicator/indicator-object.h'
--- libindicator/indicator-object.h	2011-07-05 21:15:14 +0000
+++ libindicator/indicator-object.h	2011-07-19 15:05:07 +0000
@@ -57,6 +57,8 @@
 #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 @@
 	@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 @@
 	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);
 
 	/* Reserved */
 	void       (*reserved1)     (void);
@@ -132,7 +136,6 @@
 	void       (*reserved3)     (void);
 	void       (*reserved4)     (void);
 	void       (*reserved5)     (void);
-	void       (*reserved6)     (void);
 };
 
 /**