Merge lp:~larsu/indicator-messages/lp1058386 into lp:indicator-messages/12.10

[Lars Karlitski]

libmessaging-menu: don't crash when getting an invalid desktop id

Instead, silently don't export menus and actions. The single warning about the desktop id being invalid should be enough.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./label=quantal/21/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[jenkins (martin-mrazik+qa)]

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/indicator-messages-autolanding/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-autolanding/./label=quantal/9/console

review: Needs Fixing (continuous-integration)

=== modified file 'libmessaging-menu/messaging-menu.c'
--- libmessaging-menu/messaging-menu.c	2012-09-18 19:54:37 +0000
+++ libmessaging-menu/messaging-menu.c	2012-10-01 15:35:24 +0000
@@ -148,7 +148,8 @@
 {
   gchar *path;
 
-  g_return_val_if_fail (app->appinfo != NULL, NULL);
+  if (!app->appinfo)
+    return NULL;
 
   path = g_strconcat ("/com/canonical/indicator/messages/",
                       g_app_info_get_id (G_APP_INFO (app->appinfo)),
@@ -170,6 +171,10 @@
   guint id;
   gchar *object_path;
 
+  object_path = messaging_menu_app_get_dbus_object_path (app);
+  if (!object_path)
+    return;
+
   bus = g_bus_get_finish (res, &error);
   if (bus == NULL)
     {
@@ -178,8 +183,6 @@
       return;
     }
 
-  object_path = messaging_menu_app_get_dbus_object_path (app);
-
   id = g_dbus_connection_export_action_group (bus,
                                               object_path,
                                               G_ACTION_GROUP (app->source_actions),
@@ -479,6 +482,8 @@
     return;
 
   object_path = messaging_menu_app_get_dbus_object_path (app);
+  if (!object_path)
+    return;
 
   indicator_messages_service_call_register_application (app->messages_service,
                                                         g_app_info_get_id (G_APP_INFO (app->appinfo)),
@@ -510,6 +515,9 @@
   if (!app->messages_service)
     return;
 
+  if (!app->appinfo)
+    return;
+
   indicator_messages_service_call_unregister_application (app->messages_service,
                                                           g_app_info_get_id (G_APP_INFO (app->appinfo)),
                                                           app->cancellable,
@@ -546,6 +554,9 @@
   if (!app->messages_service)
     return;
 
+  if (!app->appinfo)
+    return;
+
   indicator_messages_service_call_set_status (app->messages_service,
                                               g_app_info_get_id (G_APP_INFO (app->appinfo)),
                                               status_ids [status],