← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~cjcurran/indicator-session/null-error-user-dbus-mgr into lp:indicator-session

 

Conor Curran has proposed merging lp:~cjcurran/indicator-session/null-error-user-dbus-mgr into lp:indicator-session.

Requested reviews:
  Ted Gould (ted)
Related bugs:
  Bug #840660 in Session Menu: "indicator-session-service crashed with SIGSEGV in g_cclosure_marshal_VOID__STRING()"
  https://bugs.launchpad.net/indicator-session/+bug/840660

For more details, see:
https://code.launchpad.net/~cjcurran/indicator-session/null-error-user-dbus-mgr/+merge/74080

fixes the bug attached
-- 
https://code.launchpad.net/~cjcurran/indicator-session/null-error-user-dbus-mgr/+merge/74080
Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file 'src/users-service-dbus.c'
--- src/users-service-dbus.c	2011-08-22 19:24:56 +0000
+++ src/users-service-dbus.c	2011-09-05 11:28:25 +0000
@@ -931,9 +931,11 @@
                           G_TYPE_BOOLEAN, &can_activate,
                           G_TYPE_INVALID))
     {
-      g_warning ("Failed to determine if seat can activate sessions: %s", error->message);
-      g_error_free (error);
-
+      if (error != NULL){
+        g_warning ("Failed to determine if seat can activate sessions: %s",
+                    error->message);
+        g_error_free (error);
+      }
       return FALSE;
     }
 


Follow ups