ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/lp740382 into lp:indicator-session.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  Bug #740382 in Session Menu: "gtk-logout-helper crashed with SIGABRT in __libc_start_main()"
  https://bugs.launchpad.net/indicator-session/+bug/740382

For more details, see:
https://code.launchpad.net/~ted/indicator-session/lp740382/+merge/77176

Fixing and abort and adding an INVALID to the params so we have the proper
two so that we should get less errors that cause the abort.
-- 
https://code.launchpad.net/~ted/indicator-session/lp740382/+merge/77176
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/gtk-logout-helper.c'
--- src/gtk-logout-helper.c	2011-09-08 03:09:01 +0000
+++ src/gtk-logout-helper.c	2011-09-27 14:58:23 +0000
@@ -55,6 +55,7 @@
 			dbus_g_proxy_call(proxy,
 			                  "Stop",
 			                  &error,
+			                  G_TYPE_INVALID,
 			                  G_TYPE_INVALID);
 			break;
 		case LOGOUT_DIALOG_TYPE_RESTART:
@@ -62,6 +63,7 @@
 			dbus_g_proxy_call(proxy,
 			                  "Restart",
 			                  &error,
+			                  G_TYPE_INVALID,
 			                  G_TYPE_INVALID);
 			break;
 		default:
@@ -72,7 +74,7 @@
 	g_object_unref(proxy);
 
 	if (error != NULL) {
-		g_error("Unable to signal ConsoleKit");
+		g_warning("Unable to signal ConsoleKit");
 		g_error_free(error);
 	}