ayatana-commits team mailing list archive

[David Barth <david.barth@xxxxxxxxxxxxx>]

David Barth has proposed merging lp:~dbarth/indicator-session/no-gdm-fix into lp:indicator-session.

    Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)


Fix for https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/506683
-- 
https://code.launchpad.net/~dbarth/indicator-session/no-gdm-fix/+merge/19702
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/users-service-dbus.c'
--- src/users-service-dbus.c	2010-02-09 23:24:23 +0000
+++ src/users-service-dbus.c	2010-02-19 12:31:12 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
 /*
  * Copyright 2009 Canonical Ltd.
  *
@@ -183,7 +184,8 @@
   create_ck_proxy (self);
   create_seat_proxy (self);
 
-  users_loaded (priv->gdm_proxy, self);
+  if (priv->gdm_proxy)
+    users_loaded (priv->gdm_proxy, self);
 }
 
 static void
@@ -214,7 +216,7 @@
     {
       if (error != NULL)
         {
-          g_error ("Unable to get DisplayManager proxy on system bus: %s", error->message);
+          g_warning ("Unable to get DisplayManager proxy on system bus: %s", error->message);
           g_error_free (error);
         }
 
@@ -679,6 +681,8 @@
   GError                  *error = NULL;
   gint                     count;
 
+  g_return_if_fail (proxy != NULL);
+
   service = (UsersServiceDbus *)user_data;
   priv = USERS_SERVICE_DBUS_GET_PRIVATE (service);
 
@@ -859,6 +863,8 @@
 start_new_user_session (UsersServiceDbus *self,
                         UserData         *user)
 {
+  g_return_val_if_fail (IS_USERS_SERVICE_DBUS (self), FALSE);
+
   UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
   GError   *error = NULL;
   char     *ssid;