Merge lp:~ted/indicator-messages/list-add-error into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

[Ted Gould]

Add a DBus error for list_add()

Takes the error that we can't find the desktop file and passes is back through DBus so that app developers can see it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/66/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks good.

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2013-08-19 16:27:04 +0000
+++ src/im-application-list.c	2013-08-19 16:27:05 +0000
@@ -576,7 +576,7 @@
   g_desktop_app_info_launch_action (app->info, g_action_get_name (G_ACTION (action)), NULL);
 }
 
-void
+gboolean
 im_application_list_add (ImApplicationList  *list,
                          const gchar        *desktop_id)
 {
@@ -590,13 +590,13 @@
   g_return_if_fail (desktop_id != NULL);
 
   if (im_application_list_lookup (list, desktop_id))
-    return;
+    return TRUE;
 
   info = g_desktop_app_info_new (desktop_id);
   if (!info)
     {
       g_warning ("an application with id '%s' is not installed", desktop_id);
-      return;
+      return FALSE;
     }
 
   id = g_app_info_get_id (G_APP_INFO (info));
@@ -645,6 +645,8 @@
 
   g_object_unref (launch_action);
   g_object_unref (actions);
+
+  return TRUE;
 }
 
 void

=== modified file 'src/im-application-list.h'
--- src/im-application-list.h	2013-08-19 16:27:04 +0000
+++ src/im-application-list.h	2013-08-19 16:27:05 +0000
@@ -36,7 +36,7 @@
 
 ImApplicationList *     im_application_list_new                 (void);
 
-void                    im_application_list_add                 (ImApplicationList *list,
+gboolean                im_application_list_add                 (ImApplicationList *list,
                                                                  const gchar       *desktop_id);
 
 void                    im_application_list_remove              (ImApplicationList *list,

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2013-08-19 16:27:04 +0000
+++ src/messages-service.c	2013-08-19 16:27:05 +0000
@@ -43,6 +43,12 @@
 static GHashTable *menus;
 static GSettings *settings;
 
+enum {
+	DBUS_ERROR_BAD_DESKTOP_FILE,
+};
+
+G_DEFINE_QUARK(indicator_messages_dbus_error, dbus_error);
+
 static void
 register_application (IndicatorMessagesService *service,
 		      GDBusMethodInvocation *invocation,
@@ -53,7 +59,10 @@
 	GDBusConnection *bus;
 	const gchar *sender;
 
-	im_application_list_add (applications, desktop_id);
+	if (!im_application_list_add (applications, desktop_id)) {
+		g_dbus_method_invocation_return_error(invocation, dbus_error_quark(), DBUS_ERROR_BAD_DESKTOP_FILE, "Unable to find or parse desktop file for application '%s'", desktop_id);
+		return;
+	}
 
 	bus = g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (service));
 	sender = g_dbus_method_invocation_get_sender (invocation);
@@ -125,6 +134,9 @@
 	const gchar *profile;
 	ImMenu *menu;
 
+	/* Register some errors */
+	g_dbus_error_register_error (dbus_error_quark(), DBUS_ERROR_BAD_DESKTOP_FILE, "BadDesktopFile");
+
 	g_dbus_connection_export_action_group (bus, INDICATOR_MESSAGES_DBUS_OBJECT,
 					       im_application_list_get_action_group (applications),
 					       &error);