Merge lp:~charlesk/indicator-session/lp-1078119 into lp:indicator-session/13.04

[Charles Kerr]

In users-service-dbus.c, check to make sure that create_display_proxy() succeeded before using the proxy pointer that gets returned.

In users-service-dbus.c, check to make sure that create_display_proxy() succeeded before using the proxy pointer that gets returned.

[PS Jenkins bot (ps-jenkins)]

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Good catch! Doubly so if it fixes the Jenkins issue from last week.

Just one thing I noticed in passing: accounts_user_proxy_get_user_name returns a `const gchar *` it got from a variant that it doesn't hold a reference to anymore. It happens to work because the variant stays alive inside the GDBusProxy.

review: Approve

[Charles Kerr (charlesk)]

Hmm, that's in the autogenerated code. I don't see any way around that other than just to avoid that function & use the ..._dup_user_name() version instead?

This same issue happens for accounts_user_proxy_get_real_name(), accounts_user_proxy_get_home_directory()... really any string property.

=== modified file 'src/users-service-dbus.c'
--- src/users-service-dbus.c	2012-07-06 21:55:41 +0000
+++ src/users-service-dbus.c	2012-11-12 23:33:23 +0000
@@ -927,11 +927,16 @@
 void
 users_service_dbus_show_greeter (UsersServiceDbus * self)
 {
+  DisplayManagerSeat * dp;
+
   g_return_if_fail (IS_USERS_SERVICE_DBUS(self));
 
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  display_manager_seat_call_switch_to_greeter_sync (dp, NULL, NULL);
-  g_clear_object (&dp);
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      display_manager_seat_call_switch_to_greeter_sync (dp, NULL, NULL);
+      g_clear_object (&dp);
+    }
 }
 
 /**
@@ -942,11 +947,16 @@
 void
 users_service_dbus_activate_guest_session (UsersServiceDbus * self)
 {
-  g_return_if_fail(IS_USERS_SERVICE_DBUS(self));
-
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  display_manager_seat_call_switch_to_guest_sync (dp, "", NULL, NULL);
-  g_clear_object (&dp);
+  DisplayManagerSeat * dp;
+
+  g_return_if_fail (IS_USERS_SERVICE_DBUS(self));
+
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      display_manager_seat_call_switch_to_guest_sync (dp, "", NULL, NULL);
+      g_clear_object (&dp);
+    }
 }
 
 /**
@@ -958,12 +968,17 @@
 users_service_dbus_activate_user_session (UsersServiceDbus * self,
                                           AccountsUser     * user)
 {
+  DisplayManagerSeat * dp;
+
   g_return_if_fail (IS_USERS_SERVICE_DBUS(self));
 
-  const char * const username = accounts_user_get_user_name (user);
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  display_manager_seat_call_switch_to_user_sync (dp, username, "", NULL, NULL);
-  g_clear_object (&dp);
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      const char * const username = accounts_user_get_user_name (user);
+      display_manager_seat_call_switch_to_user_sync (dp, username, "", NULL, NULL);
+      g_clear_object (&dp);
+    }
 }
 
 /**
@@ -974,11 +989,18 @@
 gboolean
 users_service_dbus_guest_session_enabled (UsersServiceDbus * self)
 {
-  g_return_val_if_fail(IS_USERS_SERVICE_DBUS(self), FALSE);
-
-  DisplayManagerSeat * dp = create_display_proxy (self);
-  const gboolean enabled = display_manager_seat_get_has_guest_account (dp);
-  g_clear_object (&dp);
+  DisplayManagerSeat * dp;
+  gboolean enabled = FALSE;
+
+  g_return_val_if_fail (IS_USERS_SERVICE_DBUS(self), enabled);
+
+  dp = create_display_proxy (self);
+  if (dp != NULL)
+    {
+      enabled = display_manager_seat_get_has_guest_account (dp);
+      g_clear_object (&dp);
+    }
+
   return enabled;
 }