[gnome-settings-daemon] a11y-keyboard: Use new SessionManager singleton

[Bastien Nocera <hadess src gnome org>]

commit d8a9e0acba50d8dde306f030ed14b295d034eeb8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Oct 22 10:03:26 2012 +0200

    a11y-keyboard: Use new SessionManager singleton
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686556

 plugins/a11y-keyboard/Makefile.am                  |    9 ++++++---
 .../a11y-keyboard/gsd-a11y-preferences-dialog.c    |   19 ++-----------------
 2 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 912800a..9df42f0 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -50,11 +50,14 @@ test_a11y_preferences_dialog_CPPFLAGS = \
 test_a11y_preferences_dialog_CFLAGS = \
 	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(SYSTEMD_CFLAGS)		\
 	$(AM_CFLAGS)
 
-test_a11y_preferences_dialog_LDADD = \
-	$(SETTINGS_DAEMON_LIBS)			\
-	$(SETTINGS_PLUGIN_LIBS)			\
+test_a11y_preferences_dialog_LDADD =			\
+	$(SETTINGS_DAEMON_LIBS)				\
+	$(SETTINGS_PLUGIN_LIBS)				\
+	$(SYSTEMD_LIBS)					\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
 	$(NULL)
 
 plugin_LTLIBRARIES = \
diff --git a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c
index d2fb735..f68aa40 100644
--- a/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c
@@ -31,12 +31,9 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
+#include "gnome-settings-session.h"
 #include "gsd-a11y-preferences-dialog.h"
 
-#define SM_DBUS_NAME      "org.gnome.SessionManager"
-#define SM_DBUS_PATH      "/org/gnome/SessionManager"
-#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
-
 
 #define GSD_A11Y_PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_A11Y_PREFERENCES_DIALOG, GsdA11yPreferencesDialogPrivate))
 
@@ -203,19 +200,7 @@ config_have_at_gsettings_condition (const char *condition)
                 g_error_free (error);
                 return FALSE;
         }
-        sm_proxy = g_dbus_proxy_new_sync (connection,
-                                          0, NULL,
-                                          SM_DBUS_NAME,
-                                          SM_DBUS_PATH,
-                                          SM_DBUS_INTERFACE,
-                                          NULL,
-                                          &error);
-        if (sm_proxy == NULL) {
-                g_warning ("Unable to get proxy for %s: %s", SM_DBUS_NAME, error->message);
-                g_error_free (error);
-                return FALSE;
-        }
-
+        sm_proxy = gnome_settings_session_get_session_proxy ();
         is_handled = FALSE;
         res = g_dbus_proxy_call_sync (sm_proxy,
                                       "IsAutostartConditionHandled",