summaryrefslogtreecommitdiff
path: root/gnome-settings-daemon/gnome-settings-session.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2013-08-02 15:54:26 -0400
committerRay Strode <rstrode@redhat.com>2013-08-06 15:16:29 -0400
commit541cf9615dce339e8f2efb32c16c3a94680917c5 (patch)
tree9d65334135305032fd8e28407e8b639748af3429 /gnome-settings-daemon/gnome-settings-session.c
parente7b2835443d4e0bbb4d379de0b9dcae5c36bebfe (diff)
downloadgnome-settings-daemon-541cf9615dce339e8f2efb32c16c3a94680917c5.tar.gz
common: generate session manager proxy
Generating D-Bus proxies is more convienent and more typesafe than using naked GDBusProxy objects. As a first step this commit changes the common session manager proxy to be generated from XML. Since the generated proxy can be compatibly used in any existing GDBusProxy calls, this commit doesn't attempt to rewrite all the plugins to use the generated apis. That can happen in future clean ups. https://bugzilla.gnome.org/show_bug.cgi?id=705127
Diffstat (limited to 'gnome-settings-daemon/gnome-settings-session.c')
-rw-r--r--gnome-settings-daemon/gnome-settings-session.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
index a9efeded..0d883a5d 100644
--- a/gnome-settings-daemon/gnome-settings-session.c
+++ b/gnome-settings-daemon/gnome-settings-session.c
@@ -31,25 +31,22 @@
#define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager"
#define GNOME_SESSION_DBUS_OBJECT "/org/gnome/SessionManager"
-#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
-GDBusProxy *
+GsdSessionManager *
gnome_settings_session_get_session_proxy (void)
{
- static GDBusProxy *session_proxy;
+ static GsdSessionManager *session_proxy;
GError *error = NULL;
if (session_proxy != NULL) {
g_object_ref (session_proxy);
} else {
- session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
- GNOME_SESSION_DBUS_NAME,
- GNOME_SESSION_DBUS_OBJECT,
- GNOME_SESSION_DBUS_INTERFACE,
- NULL,
- &error);
+ session_proxy = gsd_session_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_NONE,
+ GNOME_SESSION_DBUS_NAME,
+ GNOME_SESSION_DBUS_OBJECT,
+ NULL,
+ &error);
if (error) {
g_warning ("Failed to connect to the session manager: %s", error->message);
g_error_free (error);