Merge lp:~indicator-applet-developers/indicator-application/lucid into lp:~ubuntu-desktop/indicator-application/ubuntu

[Ted Gould]

[Ted Gould (ted)]

0.0.13

=== modified file 'configure.ac'
--- configure.ac	2010-02-08 15:51:25 +0000
+++ configure.ac	2010-02-11 16:44:12 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.0.12, [e-mail])
+AC_INIT(indicator-application, 0.0.13, [e-mail])
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.12)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.13)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-09 00:25:26 +0000
+++ debian/changelog	2010-02-11 16:44:12 +0000
@@ -1,3 +1,11 @@
+indicator-application (0.0.13-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.13
+    * Changing the menu property to be a proper DBus object path
+    * Make object paths unique by including application IDs in them
+
+ -- Ted Gould <[e-mail]>  Thu, 11 Feb 2010 10:41:53 -0600
+
 indicator-application (0.0.12-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.0.12
 
=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c	2010-02-06 18:06:53 +0000
+++ src/application-service-appstore.c	2010-02-11 16:44:12 +0000
@@ -222,7 +222,16 @@
 	app_lru_file_touch(priv->lrufile, app->id, app->category);
 
 	app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
-	app->menu = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU));
+
+	GValue * menuval = (GValue *)g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU);
+	if (G_VALUE_TYPE(menuval) == G_TYPE_STRING) {
+		/* This is here to support an older version where we
+		   were using strings instea of object paths. */
+		app->menu = g_value_dup_string(menuval);
+	} else {
+		app->menu = g_strdup((gchar *)g_value_get_boxed(menuval));
+	}
+
 	if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) {
 		app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME));
 	}
 
=== modified file 'src/libappindicator/app-indicator.c'
--- src/libappindicator/app-indicator.c	2010-02-08 15:33:13 +0000
+++ src/libappindicator/app-indicator.c	2010-02-11 16:44:12 +0000
@@ -59,6 +59,7 @@
 struct _AppIndicatorPrivate {
 	/* Properties */
 	gchar                *id;
+	gchar                *clean_id;
 	AppIndicatorCategory  category;
 	AppIndicatorStatus    status;
 	gchar                *icon_name;
@@ -115,9 +116,8 @@
 #define APP_INDICATOR_GET_PRIVATE(o) \
                              (G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_INDICATOR_TYPE, AppIndicatorPrivate))
 
-/* Default Paths */
+/* Default Path */
 #define DEFAULT_ITEM_PATH   "/org/ayatana/NotificationItem"
-#define DEFAULT_MENU_PATH   "/org/ayatana/NotificationItem/Menu"
 
 /* More constants */
 #define DEFAULT_FALLBACK_TIMER  100 /* in milliseconds */
@@ -215,10 +215,10 @@
 
         g_object_class_install_property(object_class,
                                         PROP_MENU,
-                                        g_param_spec_string (PROP_MENU_S,
+                                        g_param_spec_boxed (PROP_MENU_S,
                                                              "The object path of the menu on DBus.",
                                                              "A method for getting the menu path as a string for DBus.",
-                                                             NULL,
+                                                             DBUS_TYPE_G_OBJECT_PATH,
                                                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property (object_class,
@@ -307,6 +307,7 @@
 	AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
 
 	priv->id = NULL;
+	priv->clean_id = NULL;
 	priv->category = APP_INDICATOR_CATEGORY_OTHER;
 	priv->status = APP_INDICATOR_STATUS_PASSIVE;
 	priv->icon_name = NULL;
@@ -332,11 +333,7 @@
 	}
 	dbus_g_connection_ref(priv->connection);
 
-	dbus_g_connection_register_g_object(priv->connection,
-	                                    DEFAULT_ITEM_PATH,
-	                                    G_OBJECT(self));
-
-        self->priv = priv;
+	self->priv = priv;
 
 	return;
 }
@@ -413,6 +410,11 @@
 		priv->id = NULL;
 	}
 
+	if (priv->clean_id != NULL) {
+		g_free(priv->clean_id);
+		priv->clean_id = NULL;
+	}
+
 	if (priv->icon_name != NULL) {
 		g_free(priv->icon_name);
 		priv->icon_name = NULL;
@@ -445,16 +447,23 @@
 
         switch (prop_id) {
         case PROP_ID:
-          if (priv->id != NULL) {
-            g_warning ("Resetting ID value when I already had a value of: %s", priv->id);
-            g_free (priv->id);
-            priv->id = NULL;
-          }
-
-          priv->id = g_strdup (g_value_get_string (value));
-
-          check_connect (self);
-          break;
+			if (priv->id != NULL) {
+				g_warning ("Resetting ID value when I already had a value of: %s", priv->id);
+				break;
+			}
+
+			priv->id = g_strdup (g_value_get_string (value));
+
+			priv->clean_id = g_strdup(priv->id);
+			gchar * cleaner;
+			for (cleaner = priv->clean_id; *cleaner != '\0'; cleaner++) {
+				if (!g_ascii_isalnum(*cleaner)) {
+					*cleaner = '_';
+				}
+			}
+
+			check_connect (self);
+			break;
 
         case PROP_CATEGORY:
           enum_val = g_enum_get_value_by_nick ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY),
@@ -547,14 +556,14 @@
           break;
 
         case PROP_MENU:
-          if (G_VALUE_HOLDS_STRING(value)) {
-            if (priv->menuservice != NULL) {
-              g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, value);
-            }
-          } else {
-            WARN_BAD_TYPE(PROP_MENU_S, value);
-          }
-          break;
+			if (priv->menuservice != NULL) {
+				GValue strval = {0};
+				g_value_init(&strval, G_TYPE_STRING);
+				g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval);
+				g_value_set_boxed(value, g_value_get_string(&strval));
+				g_value_unset(&strval);
+			}
+			break;
 
         case PROP_CONNECTED:
           g_value_set_boolean (value, priv->watcher_proxy != NULL ? TRUE : FALSE);
@@ -584,6 +593,11 @@
 	if (priv->icon_name == NULL) return;
 	if (priv->id == NULL) return;
 
+	gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id);
+	dbus_g_connection_register_g_object(priv->connection,
+	                                    path,
+	                                    G_OBJECT(self));
+
 	GError * error = NULL;
 	priv->watcher_proxy = dbus_g_proxy_new_for_name_owner(priv->connection,
 	                                                      NOTIFICATION_WATCHER_DBUS_ADDR,
@@ -595,11 +609,13 @@
 		   it's not a warning anymore. */
 		g_error_free(error);
 		start_fallback_timer(self, FALSE);
+		g_free(path);
 		return;
 	}
 
 	g_signal_connect(G_OBJECT(priv->watcher_proxy), "destroy", G_CALLBACK(watcher_proxy_destroyed), self);
-	org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, DEFAULT_ITEM_PATH, register_service_cb, self);
+	org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self);
+	g_free(path);
 
 	return;
 }
@@ -1220,7 +1236,9 @@
                         root);
 
   if (priv->menuservice == NULL) {
-    priv->menuservice = dbusmenu_server_new (DEFAULT_MENU_PATH);
+    gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id);
+    priv->menuservice = dbusmenu_server_new (path);
+	g_free(path);
   }
 
   dbusmenu_server_set_root (priv->menuservice, root);
@@ -1244,6 +1262,7 @@
 
   g_return_if_fail (IS_APP_INDICATOR (self));
   g_return_if_fail (GTK_IS_MENU (menu));
+  g_return_if_fail (self->priv->clean_id != NULL);
 
   priv = self->priv;
 
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-02-06 01:30:41 +0000
+++ tests/Makefile.am	2010-02-11 16:44:12 +0000
@@ -158,14 +158,16 @@
 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
 test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
-	@echo "#!/bin/sh" > test-libappindicator-dbus
+	@echo "#!/bin/bash" > test-libappindicator-dbus
+	@echo . $(srcdir)/run-xvfb.sh >> $@
 	@echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
 	@chmod +x test-libappindicator-dbus
 
 TESTS += test-libappindicator-dbus
 
 test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
-	@echo "#!/bin/sh" > test-libappindicator-status
+	@echo "#!/bin/bash" > test-libappindicator-status
+	@echo . $(srcdir)/run-xvfb.sh >> $@
 	@echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
 	@chmod +x test-libappindicator-status
 
 
=== modified file 'tests/test-libappindicator-dbus-client.c'
--- tests/test-libappindicator-dbus-client.c	2010-01-12 06:06:47 +0000
+++ tests/test-libappindicator-dbus-client.c	2010-02-11 16:44:12 +0000
@@ -200,7 +200,7 @@
 
 	DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus,
 	                                                     ":1.0",
-	                                                     "/org/ayatana/NotificationItem",
+	                                                     "/org/ayatana/NotificationItem/my_id",
 	                                                     DBUS_INTERFACE_PROPERTIES,
 	                                                     &error);
 	if (error != NULL) {
 
=== modified file 'tests/test-libappindicator-dbus-server.c'
--- tests/test-libappindicator-dbus-server.c	2009-12-04 17:02:30 +0000
+++ tests/test-libappindicator-dbus-server.c	2010-02-11 16:44:12 +0000
@@ -23,7 +23,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <libappindicator/app-indicator.h>
 #include "test-defines.h"
 
@@ -39,13 +39,19 @@
 gint
 main (gint argc, gchar * argv[])
 {
-	g_type_init();
+	gtk_init(&argc, &argv);
 
 	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
 
 	AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY);
-        app_indicator_set_status (ci, TEST_STATE);
-        app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME);
+	app_indicator_set_status (ci, TEST_STATE);
+	app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME);
+
+	GtkMenu * menu = GTK_MENU(gtk_menu_new());
+	GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label"));
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item));
+
+	app_indicator_set_menu(ci, menu);
 
 	g_timeout_add_seconds(2, kill_func, NULL);
 
 
=== modified file 'tests/test-libappindicator-status-server.c'
--- tests/test-libappindicator-status-server.c	2010-02-06 17:44:32 +0000
+++ tests/test-libappindicator-status-server.c	2010-02-11 16:44:12 +0000
@@ -55,7 +55,7 @@
 gint
 main (gint argc, gchar * argv[])
 {
-	g_type_init();
+	gtk_init(&argc, &argv);
 
 	g_usleep(100000);
 
@@ -64,6 +64,12 @@
 	AppIndicator * ci = app_indicator_new ("my-id", "my-icon-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 	app_indicator_set_attention_icon (ci, "my-attention-icon");
 
+	GtkMenu * menu = GTK_MENU(gtk_menu_new());
+	GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label"));
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item));
+
+	app_indicator_set_menu(ci, menu);
+
 	g_timeout_add(50, toggle, ci);
 
 	mainloop = g_main_loop_new(NULL, FALSE);