[Xfce4-commits] <xfce4-session:master> Remove the gconf code and dependency.

[Nick Schermer]

Updating branch refs/heads/master
         to f483eeb12a94db0392ef9b4e1b9f5a4cbdc0b7d1 (commit)
       from b342d3e93b4d1f7c18f36253884281c51d905dfc (commit)

commit f483eeb12a94db0392ef9b4e1b9f5a4cbdc0b7d1
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Feb 17 21:37:51 2011 +0100

    Remove the gconf code and dependency.
    
    This was only used for the assistive technology check
    that is now started in another way. The daemon is still
    closed on logout, since this is a spawn command.

 configure.in.in                   |    2 --
 xfce4-session/xfsm-compat-gnome.c |   17 -----------------
 2 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 480ec55..23ca657 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -92,8 +92,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0],
                            [panel-plugin], [Panel logout menu button], [yes])
 
 dnl Check for gnome support
-XDT_CHECK_OPTIONAL_PACKAGE([GNOME], [gconf-2.0], [2.4.0], [gnome],
-                           [Assistive technologies support], [no])
 XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22],
                            [libgnome-keyring],
                            [Extra gnome-keyring compatibility support], [no])
diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c
index f498362..386470f 100644
--- a/xfce4-session/xfsm-compat-gnome.c
+++ b/xfce4-session/xfsm-compat-gnome.c
@@ -59,9 +59,6 @@
 
 #include <libxfce4util/libxfce4util.h>
 
-#ifdef HAVE_GNOME
-#include <gconf/gconf-client.h>
-#endif
 #ifdef HAVE_GNOME_KEYRING
 #include <gnome-keyring.h>
 #endif
@@ -70,12 +67,6 @@
 
 #define GNOME_KEYRING_DAEMON "gnome-keyring-daemon"
 
-#ifdef HAVE_GNOME
-#define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility"
-#define AT_STARTUP_KEY    "/desktop/gnome/accessibility/startup/exec_ats"
-
-static GConfClient *gnome_conf_client = NULL;
-#endif
 
 static gboolean gnome_compat_started = FALSE;
 static int keyring_lifetime_pipe[2];
@@ -271,14 +262,6 @@ xfsm_compat_gnome_shutdown (void)
   /* shutdown the keyring daemon */
   gnome_keyring_daemon_shutdown ();
 
-#ifdef HAVE_GNOME
-  if (gnome_conf_client != NULL)
-    {
-      g_object_unref (G_OBJECT (gnome_conf_client));
-      gnome_conf_client = NULL;
-    }
-#endif
-
   /* shutdown the GConf daemon */
   if (!g_spawn_command_line_sync ("gconftool-2 --shutdown", NULL,
                                   NULL, &status, &error))