Commit 854edad8 authored by Colin Walters's avatar Colin Walters

main: Fix g_critical() on login

Commit
http://git.gnome.org/browse/gnome-session/commit/?id=34c380508516f8a2f81b68d189b24fedb05870ea
caused us to emit a g_critical because we were passing NULL for the
user data, when the callback expected a GsmManager.  Fixing this
requires passing the user data later.

https://bugzilla.gnome.org/show_bug.cgi?id=688774
parent a2ef87b3
......@@ -157,11 +157,6 @@ acquire_name (void)
return FALSE;
}
g_signal_connect_swapped (bus_proxy,
"destroy",
G_CALLBACK (shutdown_cb),
NULL);
if (! acquire_name_on_proxy (bus_proxy, GSM_DBUS_NAME) ) {
gsm_util_init_error (TRUE,
"%s",
......@@ -332,6 +327,11 @@ main (int argc, char **argv)
manager = gsm_manager_new (client_store, failsafe);
g_signal_connect_swapped (bus_proxy,
"destroy",
G_CALLBACK (shutdown_cb),
manager);
g_unix_signal_add (SIGTERM, term_or_int_signal_cb, manager);
g_unix_signal_add (SIGINT, term_or_int_signal_cb, manager);
g_unix_signal_add (SIGUSR1, sigusr1_cb, manager);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment