Merge lp:~microcai/libappindicator/libappindicator into lp:libappindicator/15.04

[microcai]

fix bug https://bugs.launchpad.net/cape-girardeau/+bug/1428473

[Ted Gould (ted)]

See comment on bug, we don't want that feature.

review: Disapprove

Unmerged revisions

274. By microcai <email address hidden> on 2015-03-05

fix stupid ubuntu, add Activate signals support

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2014-11-10 09:14:07 +0000
+++ src/app-indicator.c	2015-03-05 21:20:43 +0000
@@ -107,6 +107,7 @@
 	CONNECTION_CHANGED,
 	NEW_ICON_THEME_PATH,
 	SCROLL_EVENT,
+	ACTIVATE,
 	LAST_SIGNAL
 };
 
@@ -538,6 +539,20 @@
 	                                  _application_service_marshal_VOID__INT_UINT,
 	                                  G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION);
 
+	/**
+	 * AppIndicator:: activate:
+	 * @arg0: The #AppIndicator object
+	 *
+	 * Signaled when the #AppIndicator receives a activate event.
+	 */
+	signals[ACTIVATE] = g_signal_new (APP_INDICATOR_SIGNAL_ACTIVATE,
+	                                  G_TYPE_FROM_CLASS(klass),
+	                                  G_SIGNAL_RUN_LAST,
+	                                  G_STRUCT_OFFSET (AppIndicatorClass, scroll_event),
+	                                  NULL, NULL,
+	                                  g_cclosure_marshal_VOID__VOID,
+	                                  G_TYPE_NONE, 0);
+
 	/* DBus interfaces */
 	if (item_node_info == NULL) {
 		GError * error = NULL;
@@ -1092,7 +1107,11 @@
 		{
 			gtk_widget_activate (menuitem);
 		}
-	} else {
+	} else if (g_strcmp0(method, "Activate") == 0 ) {
+
+		g_signal_emit(app, signals[ACTIVATE], 0, 0, 0);
+
+	}else {
 		g_warning("Calling method '%s' on the app-indicator and it's unknown", method);
 	}
 
@@ -2465,24 +2484,6 @@
 
 #define APP_INDICATOR_SHORTY_NICK "app-indicator-shorty-nick"
 
-/* Callback when an item from the desktop shortcuts gets
-   called. */
-static void
-shorty_activated_cb (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
-{
-	gchar * nick = g_object_get_data(G_OBJECT(mi), APP_INDICATOR_SHORTY_NICK);
-	g_return_if_fail(nick != NULL);
-
-	g_return_if_fail(IS_APP_INDICATOR(user_data));
-	AppIndicator * self = APP_INDICATOR(user_data);
-	AppIndicatorPrivate *priv = self->priv;
-
-	g_return_if_fail(priv->shorties != NULL);
-
-	indicator_desktop_shortcuts_nick_exec_with_context(priv->shorties, nick, NULL);
-
-	return;
-}
 
 /**
  * app_indicator_build_menu_from_desktop:
@@ -2521,8 +2522,6 @@
 		dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
 		g_free(name);
 
-		g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(shorty_activated_cb), self);
-
 		dbusmenu_menuitem_child_append(root, item);
 	}
 

=== modified file 'src/app-indicator.h'
--- src/app-indicator.h	2012-02-03 20:37:56 +0000
+++ src/app-indicator.h	2015-03-05 21:20:43 +0000
@@ -119,7 +119,7 @@
 #define APP_INDICATOR_SIGNAL_CONNECTION_CHANGED  "connection-changed"
 #define APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH "new-icon-theme-path"
 #define APP_INDICATOR_SIGNAL_SCROLL_EVENT        "scroll-event"
-
+#define APP_INDICATOR_SIGNAL_ACTIVATE            "activate"
 /**
  * AppIndicatorCategory:
  * @APP_INDICATOR_CATEGORY_APPLICATION_STATUS: The indicator is used to display the status of the application.