diff options
author | Nick Schermer <nick@xfce.org> | 2012-04-23 17:59:14 +0200 |
---|---|---|
committer | Nick Schermer <nick@xfce.org> | 2012-04-23 17:59:41 +0200 |
commit | a6f4e2ab2ec0cba9fb00254cd689df9d67678c1a (patch) | |
tree | ae0899ccfa7977090bad846e175ad9f58ed7abf4 | |
parent | 98999673a7068c673b9881b565a01ec20566754d (diff) | |
download | xfce4-session-a6f4e2ab2ec0cba9fb00254cd689df9d67678c1a.tar.gz |
Remove remaining code to shutdown gconf.
-rw-r--r-- | xfce4-session/xfsm-compat-gnome.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c index 386470fb..b5b4a994 100644 --- a/xfce4-session/xfsm-compat-gnome.c +++ b/xfce4-session/xfsm-compat-gnome.c @@ -84,11 +84,12 @@ child_setup (gpointer user_data) for (fd = 3; fd < open_max; fd++) { if (fd != keyring_lifetime_pipe[0]) - fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFD, FD_CLOEXEC); } fd_str = g_strdup_printf ("%d", keyring_lifetime_pipe[0]); g_setenv ("GNOME_KEYRING_LIFETIME_FD", fd_str, TRUE); + g_free (fd_str); } @@ -253,29 +254,12 @@ xfsm_compat_gnome_startup (XfsmSplashScreen *splash) void xfsm_compat_gnome_shutdown (void) { - GError *error = NULL; - gint status; - if (G_UNLIKELY (!gnome_compat_started)) return; /* shutdown the keyring daemon */ gnome_keyring_daemon_shutdown (); - /* shutdown the GConf daemon */ - if (!g_spawn_command_line_sync ("gconftool-2 --shutdown", NULL, - NULL, &status, &error)) - { - g_warning ("Failed to shutdown the GConf daemon on logout: %s", - error->message); - g_error_free (error); - } - else if (status != 0) - { - g_warning ("Failed to shutdown the GConf daemon on logout: " - "gconftool-2 returned status %d", status); - } - xfsm_compat_gnome_smproxy_shutdown (); gnome_compat_started = FALSE; |