Merge lp:~unity-settings-daemon-team/unity-settings-daemon/x-sru2 into lp:unity-settings-daemon/16.04

[Marco Trevisan (Treviño)]

Releasing SRU2 for Xenial

[Sebastien Bacher (seb128)]

looks good but we should probably revert r4141 which is a behaviour change and arguable for a SRU

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Removed as requested

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-29 15:38:15 +0000
+++ debian/changelog	2016-06-29 16:17:06 +0000
@@ -1,3 +1,33 @@
+unity-settings-daemon (15.04.1+16.04.20160209-0ubuntu3) UNRELEASED; urgency=medium
+
+  [ Robert Ancell ]
+  * Correctly check value of XDG_CURRENT_DESKTOP.
+
+  [ Marco Trevisan (Treviño) ]
+  * PowerManager: connect to keyboard BrightnessChanged signal to update
+    the cached current value properly (LP: #1510344)
+  * GsdPowerManager: don't cache kbd backlight current value (LP:
+    #1583861)
+  * common: backport g-s-d commits for having single shared dbus proxies
+  * ScreensaverProxy: redirect supported calls to gnome screensaver APIs
+    (LP: #1415265, LP: #1584161)
+
+  [ Sebastien Bacher ]
+  * Don't hit an xerror when a device is removed while being configured
+    (LP: #1503758)
+  * wacom: don't segfault when a device is removed while being
+    configured. (LP: #1439427)
+
+  [ Marco Trevisan (Treviño) ]
+  * GsdPowerManager: use proper return value for upower_kbd_toggle
+    wherever we use it (LP: #1592816)
+
+  [ Kai-Heng Feng ]
+  * SettingsManager: Queue up signals before getting D-Bus connection.
+    (LP: #1571640)
+
+ -- Robert Ancell <[e-mail]>  Wed, 29 Jun 2016 18:16:22 +0200
+
 unity-settings-daemon (15.04.1+16.04.20160209-0ubuntu2) xenial; urgency=medium
 
   * plugins/power/gsd-power-manager.c:
 
=== modified file 'gnome-settings-daemon/Makefile.am'
--- gnome-settings-daemon/Makefile.am	2014-10-07 01:58:12 +0000
+++ gnome-settings-daemon/Makefile.am	2016-06-29 16:17:06 +0000
@@ -1,4 +1,5 @@
 NULL =
+BUILT_SOURCES = $(NULL)
 
 INCLUDES = \
 	-DDATADIR=\""$(datadir)"\"				\
@@ -80,11 +81,38 @@
 	libgsd.la		\
 	$(NULL)
 
+session_manager_dbus_built_sources = gsd-session-manager-glue.c gsd-session-manager-glue.h
+BUILT_SOURCES += $(session_manager_dbus_built_sources)
+
+$(session_manager_dbus_built_sources) : Makefile.am org.gnome.SessionManager.xml
+	gdbus-codegen							\
+		--interface-prefix org.gnome.SessionManager.		\
+		--generate-c-code gsd-session-manager-glue		\
+		--c-namespace Gsd					\
+		--annotate "org.gnome.SessionManager"			\
+		           "org.gtk.GDBus.C.Name" SessionManager	\
+		$(srcdir)/org.gnome.SessionManager.xml
+
+screen_saver_dbus_built_sources = gsd-screen-saver-glue.c gsd-screen-saver-glue.h
+
+BUILT_SOURCES += $(screen_saver_dbus_built_sources)
+
+$(screen_saver_dbus_built_sources) : Makefile.am org.gnome.ScreenSaver.xml
+	gdbus-codegen						\
+		--interface-prefix org.gnome.ScreenSaver.	\
+		--generate-c-code gsd-screen-saver-glue		\
+		--c-namespace Gsd				\
+		--annotate "org.gnome.ScreenSaver"		\
+		           "org.gtk.GDBus.C.Name" ScreenSaver	\
+		$(srcdir)/org.gnome.ScreenSaver.xml
+
 libgsd_la_SOURCES =		\
+	$(session_manager_dbus_built_sources) \
+	$(screen_saver_dbus_built_sources) \
 	gnome-settings-profile.c	\
 	gnome-settings-profile.h	\
-	gnome-settings-session.c	\
-	gnome-settings-session.h	\
+	gnome-settings-bus.c	\
+	gnome-settings-bus.h	\
 	$(NULL)
 
 libgsd_la_CPPFLAGS = 		\
@@ -115,7 +143,10 @@
 
 EXTRA_DIST = \
 	unity-settings-daemon-localeexec.in \
-	idle-monitor.xml
+	org.gnome.SessionManager.xml        \
+	org.gnome.ScreenSaver.xml           \
+	idle-monitor.xml                    \
+	$(NULL)
 
 unity-settings-daemon-localeexec: unity-settings-daemon-localeexec.in
 	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@prefix\@|$(prefix)|"  $< > $@.tmp && mv $@.tmp $@
 
=== added file 'gnome-settings-daemon/gnome-settings-bus.c'
--- gnome-settings-daemon/gnome-settings-bus.c	1970-01-01 00:00:00 +0000
+++ gnome-settings-daemon/gnome-settings-bus.c	2016-06-29 16:17:06 +0000
@@ -0,0 +1,89 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2006-2011 Richard Hughes <[e-mail]>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "gnome-settings-bus.h"
+
+#define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
+#define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
+
+#define GNOME_SCREENSAVER_DBUS_NAME      "org.gnome.ScreenSaver"
+#define GNOME_SCREENSAVER_DBUS_OBJECT    "/org/gnome/ScreenSaver"
+
+GsdSessionManager *
+gnome_settings_bus_get_session_proxy (void)
+{
+        static GsdSessionManager *session_proxy;
+        GError *error =  NULL;
+
+        if (session_proxy != NULL) {
+                g_object_ref (session_proxy);
+        } else {
+                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);
+                } else {
+                        g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy);
+                }
+        }
+
+        return session_proxy;
+}
+
+GsdScreenSaver *
+gnome_settings_bus_get_screen_saver_proxy (void)
+{
+        static GsdScreenSaver *screen_saver_proxy;
+        GError *error =  NULL;
+
+        if (screen_saver_proxy != NULL) {
+                g_object_ref (screen_saver_proxy);
+        } else {
+                screen_saver_proxy = gsd_screen_saver_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                                              G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+                                                                              G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                                                              GNOME_SCREENSAVER_DBUS_NAME,
+                                                                              GNOME_SCREENSAVER_DBUS_OBJECT,
+                                                                              NULL,
+                                                                              &error);
+                if (error) {
+                        g_warning ("Failed to connect to the screen saver: %s", error->message);
+                        g_error_free (error);
+                } else {
+                        g_object_add_weak_pointer (G_OBJECT (screen_saver_proxy), (gpointer*)&screen_saver_proxy);
+                }
+        }
+
+        return screen_saver_proxy;
+}
 
=== added file 'gnome-settings-daemon/gnome-settings-bus.h'
--- gnome-settings-daemon/gnome-settings-bus.h	1970-01-01 00:00:00 +0000
+++ gnome-settings-daemon/gnome-settings-bus.h	2016-06-29 16:17:06 +0000
@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2010-2011 Richard Hughes <[e-mail]>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __GNOME_SETTINGS_BUS_H
+#define __GNOME_SETTINGS_BUS_H
+
+#include <glib-object.h>
+#include "gsd-session-manager-glue.h"
+#include "gsd-screen-saver-glue.h"
+
+G_BEGIN_DECLS
+
+GsdSessionManager        *gnome_settings_bus_get_session_proxy       (void);
+GsdScreenSaver           *gnome_settings_bus_get_screen_saver_proxy  (void);
+
+G_END_DECLS
+
+#endif /* __GNOME_SETTINGS_BUS_H */
 
=== modified file 'gnome-settings-daemon/gnome-settings-manager.c'
--- gnome-settings-daemon/gnome-settings-manager.c	2014-06-26 00:02:19 +0000
+++ gnome-settings-daemon/gnome-settings-manager.c	2016-06-29 16:17:06 +0000
@@ -55,6 +55,11 @@
 "  </interface>"
 "</node>";
 
+typedef struct  {
+        const char *signal;
+        const char *name;
+} SignalCache;
+
 struct GnomeSettingsManagerPrivate
 {
         guint                       owner_id;
@@ -64,6 +69,7 @@
         char                      **whitelist;
         GsdPnpIds                  *pnp_ids;
         GSList                     *plugins;
+        GQueue                     *signal_queue;
 };
 
 static void     gnome_settings_manager_class_init  (GnomeSettingsManagerClass *klass);
@@ -74,6 +80,17 @@
 
 static gpointer manager_object = NULL;
 
+static void signal_cache_free (SignalCache *cache)
+{
+        if (cache == NULL) {
+            return;
+        }
+
+        g_free (cache->signal);
+        g_free (cache->name);
+        g_free (cache);
+}
+
 GQuark
 gnome_settings_manager_error_quark (void)
 {
@@ -137,17 +154,23 @@
              const char              *name)
 {
         GError *error = NULL;
+        GQueue *signal_queue = manager->priv->signal_queue;
 
-        /* FIXME: maybe we should queue those up until the D-Bus
-         * connection is available... */
-        if (manager->priv->connection == NULL)
+        /* Queue up signal if there's no D-Bus connection */
+        if (manager->priv->connection == NULL) {
+                g_debug ("Connection is null, cannot emit signal, queue instead");
+                SignalCache *cache = g_new0 (SignalCache, 1);
+                cache->signal = g_strdup (signal);
+                cache->name = g_strdup (name);
+                g_queue_push_tail (signal_queue, cache);
                 return;
+        } 
 
         if (g_dbus_connection_emit_signal (manager->priv->connection,
                                            NULL,
                                            GSD_DBUS_PATH,
                                            GSD_DBUS_NAME,
-                                           "PluginActivated",
+                                           signal,
                                            g_variant_new ("(s)", name),
                                            &error) == FALSE) {
                 g_debug ("Error emitting signal: %s", error->message);
@@ -344,6 +367,7 @@
 {
         GDBusConnection *connection;
         GError *error = NULL;
+        GQueue *signal_queue = manager->priv->signal_queue;
 
         connection = g_bus_get_finish (res, &error);
         if (connection == NULL) {
@@ -351,6 +375,7 @@
                 g_error_free (error);
                 return;
         }
+
         manager->priv->connection = connection;
 
         g_dbus_connection_register_object (connection,
@@ -360,6 +385,16 @@
                                            NULL,
                                            NULL,
                                            NULL);
+
+        /* Emit queued up signals after got D-Bus connection */
+        if (!g_queue_is_empty (signal_queue)) {
+                g_debug ("Emit queued up signals");
+                while (!g_queue_is_empty (signal_queue)) {
+                        SignalCache *cache = g_queue_pop_head (signal_queue);
+                        emit_signal (manager, cache->signal, cache->name);
+                        signal_cache_free (cache);
+                }
+        }
 }
 
 static void
@@ -396,6 +431,8 @@
                 goto out;
         }
 
+        manager->priv->signal_queue = g_queue_new ();
+
         g_debug ("loading PNPIDs");
         manager->priv->pnp_ids = gsd_pnp_ids_new ();
 
@@ -425,6 +462,12 @@
                 manager->priv->owner_id = 0;
         }
 
+        /* This will be called from both stop_manager and dispose, so we need to
+         * prevent the queue being freed twice */
+        if (manager->priv->signal_queue != NULL) {
+            g_queue_free_full (manager->priv->signal_queue, signal_cache_free);
+            manager->priv->signal_queue = NULL;
+        }
         g_clear_pointer (&manager->priv->whitelist, g_strfreev);
         g_clear_object (&manager->priv->settings);
         g_clear_object (&manager->priv->pnp_ids);
 
=== removed file 'gnome-settings-daemon/gnome-settings-session.c'
--- gnome-settings-daemon/gnome-settings-session.c	2012-11-12 13:53:19 +0000
+++ gnome-settings-daemon/gnome-settings-session.c	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2006-2011 Richard Hughes <[e-mail]>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <glib.h>
-#include <gio/gio.h>
-
-#include "gnome-settings-session.h"
-
-#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 *
-gnome_settings_session_get_session_proxy (void)
-{
-        static GDBusProxy *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);
-                if (error) {
-                        g_warning ("Failed to connect to the session manager: %s", error->message);
-                        g_error_free (error);
-                } else {
-                        g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy);
-                }
-        }
-
-        return session_proxy;
-}
 
=== removed file 'gnome-settings-daemon/gnome-settings-session.h'
--- gnome-settings-daemon/gnome-settings-session.h	2012-11-12 09:12:14 +0000
+++ gnome-settings-daemon/gnome-settings-session.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2010-2011 Richard Hughes <[e-mail]>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __GNOME_SETTINGS_SESSION_H
-#define __GNOME_SETTINGS_SESSION_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-GDBusProxy              *gnome_settings_session_get_session_proxy  (void);
-
-G_END_DECLS
-
-#endif /* __GNOME_SETTINGS_SESSION_H */
-
 
=== modified file 'gnome-settings-daemon/main.c'
--- gnome-settings-daemon/main.c	2014-10-07 22:07:40 +0000
+++ gnome-settings-daemon/main.c	2016-06-29 16:17:06 +0000
@@ -36,7 +36,7 @@
 #include "gnome-settings-manager.h"
 #include "gnome-settings-plugin.h"
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-idle-monitor-private.h"
 
 #define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
@@ -351,7 +351,7 @@
 {
         GDBusProxy *proxy;
 
-        proxy = gnome_settings_session_get_session_proxy ();
+        proxy = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
 #ifdef HAVE_IBUS
         set_legacy_ibus_env_vars (proxy);
 #endif
 
=== added file 'gnome-settings-daemon/org.gnome.ScreenSaver.xml'
--- gnome-settings-daemon/org.gnome.ScreenSaver.xml	1970-01-01 00:00:00 +0000
+++ gnome-settings-daemon/org.gnome.ScreenSaver.xml	2016-06-29 16:17:06 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE node PUBLIC
+        "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<!--
+        Copyright (C) 2013 Red Hat, Inc.
+
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public
+        License as published by the Free Software Foundation; either
+        version 2 of the License, or (at your option) any later version.
+
+        This library is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+        Lesser General Public License for more details.
+
+        You should have received a copy of the GNU Lesser General
+        Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+        <!--
+        org.gnome.ScreenSaver:
+
+        An interface used for managing the lock screen.
+        -->
+        <interface name="org.gnome.ScreenSaver">
+                <method name="Lock" />
+                <method name="GetActive">
+                        <arg name="active" direction="out" type="b" />
+                </method>
+                <method name="SetActive">
+                        <arg name="value" direction="in" type="b" />
+                </method>
+                <method name="GetActiveTime">
+                        <arg name="value" direction="out" type="u" />
+                </method>
+                <signal name="ActiveChanged">
+                        <arg name="new_value" type="b" />
+                </signal>
+        </interface>
+</node>
 
=== added file 'gnome-settings-daemon/org.gnome.SessionManager.xml'
--- gnome-settings-daemon/org.gnome.SessionManager.xml	1970-01-01 00:00:00 +0000
+++ gnome-settings-daemon/org.gnome.SessionManager.xml	2016-06-29 16:17:06 +0000
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="org.gnome.SessionManager">
+
+    <!-- Initialization phase interfaces -->
+
+    <method name="Setenv">
+      <arg name="variable" type="s" direction="in">
+        <doc:doc>
+          <doc:summary>The variable name</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="value" type="s" direction="in">
+        <doc:doc>
+          <doc:summary>The value</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Adds the variable name to the application launch environment with the specified value.  May only be used during the Session Manager initialization phase.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="GetLocale">
+      <arg name="category" type="i" direction="in">
+        <doc:doc>
+          <doc:summary>The locale category</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="value" type="s" direction="out">
+        <doc:doc>
+          <doc:summary>The value</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Reads the current state of the specific locale category.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="InitializationError">
+      <arg name="message" type="s" direction="in">
+        <doc:doc>
+          <doc:summary>The error message</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="fatal" type="b" direction="in">
+        <doc:doc>
+          <doc:summary>Whether the error should be treated as fatal</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>May be used by applications launched during the Session Manager initialization phase to indicate there was a problem.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- Running phase interfaces -->
+
+    <method name="RegisterClient">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="s" name="app_id" direction="in">
+        <doc:doc>
+          <doc:summary>The application identifier</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="s" name="client_startup_id" direction="in">
+        <doc:doc>
+          <doc:summary>Client startup identifier</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="o" name="client_id" direction="out">
+        <doc:doc>
+          <doc:summary>The object path of the newly registered client</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Register the caller as a Session Management client.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="UnregisterClient">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="o" name="client_id" direction="in">
+        <doc:doc>
+          <doc:summary>The object path of the client</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Unregister the specified client from Session Management.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="Inhibit">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="s" name="app_id" direction="in">
+        <doc:doc>
+          <doc:summary>The application identifier</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="u" name="toplevel_xid" direction="in">
+        <doc:doc>
+          <doc:summary>The toplevel X window identifier</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="s" name="reason" direction="in">
+        <doc:doc>
+          <doc:summary>The reason for the inhibit</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="u" name="flags" direction="in">
+        <doc:doc>
+          <doc:summary>Flags that specify what should be inhibited</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="u" name="inhibit_cookie" direction="out">
+        <doc:doc>
+          <doc:summary>The cookie</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:summary>
+          Proactively indicates that the calling application is performing an action that should not be interrupted and sets a reason to be displayed to the user when an interruption is about to take placea.
+        </doc:summary>
+        <doc:description>
+          <doc:para>Applications should invoke this method when they begin an operation that
+            should not be interrupted, such as creating a CD or DVD.  The types of actions
+            that may be blocked are specified by the flags parameter.  When the application
+            completes the operation it should call <doc:ref type="method" to="org.gnome.SessionManager.Uninhibit">Uninhibit()</doc:ref>
+            or disconnect from the session bus.
+          </doc:para>
+          <doc:para>
+            Applications should not expect that they will always be able to block the
+            action.  In most cases, users will be given the option to force the action
+            to take place.
+          </doc:para>
+          <doc:para>
+            Reasons should be short and to the point.
+          </doc:para>
+          <doc:para>
+            The flags parameter must include at least one of the following:
+            <doc:list>
+              <doc:item>
+                <doc:term>1</doc:term>
+                <doc:definition>Inhibit logging out</doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>2</doc:term>
+                <doc:definition>Inhibit user switching</doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>4</doc:term>
+                <doc:definition>Inhibit suspending the session or computer</doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>8</doc:term>
+                <doc:definition>Inhibit the session being marked as idle</doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>16</doc:term>
+                <doc:definition>Inhibit auto-mounting removable media for the session</doc:definition>
+              </doc:item>
+            </doc:list>
+            Values for flags may be bitwise or'ed together.
+          </doc:para>
+          <doc:para>
+            The returned cookie is used to uniquely identify this request.  It should be used
+            as an argument to <doc:ref type="method" to="org.gnome.SessionManager.Uninhibit">Uninhibit()</doc:ref> in
+            order to remove the request.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="Uninhibit">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg type="u" name="inhibit_cookie" direction="in">
+        <doc:doc>
+          <doc:summary>The cookie</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Cancel a previous call to <doc:ref type="method" to="org.gnome.SessionManager.Inhibit">Inhibit()</doc:ref> identified by the cookie.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="IsInhibited">
+      <arg type="u" name="flags" direction="in">
+        <doc:doc>
+          <doc:summary>Flags that spefify what should be inhibited</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg type="b" name="is_inhibited" direction="out">
+        <doc:doc>
+          <doc:summary>Returns TRUE if any of the operations in the bitfield flags are inhibited</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Determine if operation(s) specified by the flags
+            are currently inhibited.  Flags are same as those accepted
+            by the
+            <doc:ref type="method" to="org.gnome.SessionManager.Inhibit">Inhibit()</doc:ref>
+            method.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="GetClients">
+      <arg name="clients" direction="out" type="ao">
+        <doc:doc>
+          <doc:summary>an array of client IDs</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This gets a list of all the <doc:ref type="interface" to="org.gnome.SessionManager.Client">Clients</doc:ref>
+          that are currently known to the session manager.</doc:para>
+          <doc:para>Each Client ID is an D-Bus object path for the object that implements the
+          <doc:ref type="interface" to="org.gnome.SessionManager.Client">Client</doc:ref> interface.</doc:para>
+        </doc:description>
+        <doc:seealso><doc:ref type="interface" to="org.gnome.SessionManager.Client">org.gnome.SessionManager.Client</doc:ref></doc:seealso>
+      </doc:doc>
+    </method>
+
+    <method name="GetInhibitors">
+      <arg name="inhibitors" direction="out" type="ao">
+        <doc:doc>
+          <doc:summary>an array of inhibitor IDs</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This gets a list of all the <doc:ref type="interface" to="org.gnome.SessionManager.Inhibitor">Inhibitors</doc:ref>
+          that are currently known to the session manager.</doc:para>
+          <doc:para>Each Inhibitor ID is an D-Bus object path for the object that implements the
+          <doc:ref type="interface" to="org.gnome.SessionManager.Inhibitor">Inhibitor</doc:ref> interface.</doc:para>
+        </doc:description>
+        <doc:seealso><doc:ref type="interface" to="org.gnome.SessionManager.Inhibitor">org.gnome.SessionManager.Inhibitor</doc:ref></doc:seealso>
+      </doc:doc>
+    </method>
+
+
+    <method name="IsAutostartConditionHandled">
+      <arg name="condition" direction="in" type="s">
+        <doc:doc>
+          <doc:summary>The autostart condition string</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="handled" direction="out" type="b">
+        <doc:doc>
+          <doc:summary>True if condition is handled, false otherwise</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Allows the caller to determine whether the session manager is
+          handling changes to the specified autostart condition.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="Shutdown">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Request a shutdown dialog.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="Reboot">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Request a reboot dialog.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="CanShutdown">
+      <arg name="is_available" direction="out" type="b">
+        <doc:doc>
+          <doc:summary>True if shutdown is available to the user, false otherwise</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Allows the caller to determine whether or not it's okay to show
+          a shutdown option in the UI</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="Logout">
+      <arg name="mode" type="u" direction="in">
+        <doc:doc>
+          <doc:summary>The type of logout that is being requested</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Request a logout dialog</doc:para>
+          <doc:para>
+            Allowed values for the mode parameter are:
+            <doc:list>
+              <doc:item>
+                <doc:term>0</doc:term>
+                <doc:definition>Normal.</doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>1</doc:term>
+                <doc:definition>No confirmation inferface should be shown.</doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>2</doc:term>
+                <doc:definition>Forcefully logout.  No confirmation will be shown and any inhibitors will be ignored.</doc:definition>
+              </doc:item>
+            </doc:list>
+            Values for flags may be bitwise or'ed together.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="IsSessionRunning">
+      <arg name="running" direction="out" type="b">
+        <doc:doc>
+          <doc:summary>True if the session has entered the Running phase, false otherwise</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Allows the caller to determine whether the session manager
+          has entered the Running phase, in case the client missed the
+          SessionRunning signal.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- Signals -->
+
+    <signal name="ClientAdded">
+      <arg name="id" type="o">
+        <doc:doc>
+          <doc:summary>The object path for the added client</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when a client has been added to the session manager.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+    <signal name="ClientRemoved">
+      <arg name="id" type="o">
+        <doc:doc>
+          <doc:summary>The object path for the removed client</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when a client has been removed from the session manager.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <signal name="InhibitorAdded">
+      <arg name="id" type="o">
+        <doc:doc>
+          <doc:summary>The object path for the added inhibitor</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when an inhibitor has been added to the session manager.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+    <signal name="InhibitorRemoved">
+      <arg name="id" type="o">
+        <doc:doc>
+          <doc:summary>The object path for the removed inhibitor</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when an inhibitor has been removed from the session manager.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <signal name="SessionRunning">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Indicates the session has entered the Running phase.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <signal name="SessionOver">
+      <doc:doc>
+        <doc:description>
+          <doc:para>Indicates the session is about to end.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+
+    <!-- Properties -->
+
+    <property name="SessionName" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>The name of the session that has been loaded.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="SessionIsActive" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>If true, the session is currently in the
+          foreground and available for user input.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="InhibitedActions" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>A bitmask of flags to indicate which actions
+          are inhibited. See the Inhibit() function's description
+          for a list of possible values.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+  </interface>
+</node>
 
=== modified file 'plugins/automount/gsd-automount-manager.c'
--- plugins/automount/gsd-automount-manager.c	2015-06-30 15:15:52 +0000
+++ plugins/automount/gsd-automount-manager.c	2016-06-29 16:17:06 +0000
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-automount-manager.h"
 #include "gsd-autorun.h"
 
@@ -356,7 +356,7 @@
 static void
 do_initialize_session (GsdAutomountManager *manager)
 {
-        manager->priv->session = gnome_settings_session_get_session_proxy ();
+        manager->priv->session = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
         g_signal_connect (manager->priv->session, "g-properties-changed",
                           G_CALLBACK (session_state_changed),
                           manager);
@@ -364,8 +364,6 @@
 }
 
 #define SCREENSAVER_NAME "org.gnome.ScreenSaver"
-#define SCREENSAVER_PATH "/org/gnome/ScreenSaver"
-#define SCREENSAVER_INTERFACE "org.gnome.ScreenSaver"
 
 static void
 screensaver_signal_callback (GDBusProxy *proxy,
@@ -413,32 +411,27 @@
 }
 
 static void
-screensaver_proxy_ready_cb (GObject *source,
-                            GAsyncResult *res,
-                            gpointer user_data)
+screensaver_appeared_callback (GDBusConnection *connection,
+                               const gchar *name,
+                               const gchar *name_owner,
+                               gpointer user_data)
 {
         GsdAutomountManager *manager = user_data;
-        GError *error = NULL;
-        GDBusProxy *ss_proxy;
-
-        ss_proxy = g_dbus_proxy_new_finish (res, &error);
-
-        if (error != NULL) {
-                g_warning ("Can't get proxy for the ScreenSaver object: %s",
-                           error->message);
-                g_error_free (error);
-
+
+        g_debug ("ScreenSaver name appeared");
+
+        manager->priv->ss_proxy = G_DBUS_PROXY (gnome_settings_bus_get_screen_saver_proxy ());
+
+        if (manager->priv->ss_proxy == NULL) {
+                g_warning ("Can't get proxy for the ScreenSaver object");
                 return;
         }
 
         g_debug ("ScreenSaver proxy ready");
-
-        manager->priv->ss_proxy = ss_proxy;
-
-        g_signal_connect (ss_proxy, "g-signal",
+        g_signal_connect (manager->priv->ss_proxy, "g-signal",
                           G_CALLBACK (screensaver_signal_callback), manager);
 
-        g_dbus_proxy_call (ss_proxy,
+        g_dbus_proxy_call (manager->priv->ss_proxy,
                            "GetActive",
                            NULL,
                            G_DBUS_CALL_FLAGS_NO_AUTO_START,
@@ -449,29 +442,6 @@
 }
 
 static void
-screensaver_appeared_callback (GDBusConnection *connection,
-                               const gchar *name,
-                               const gchar *name_owner,
-                               gpointer user_data)
-{
-        GsdAutomountManager *manager = user_data;
-
-        g_debug ("ScreenSaver name appeared");
-
-        manager->priv->screensaver_active = FALSE;
-
-        g_dbus_proxy_new (connection,
-                          G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-                          NULL,
-                          name,
-                          SCREENSAVER_PATH,
-                          SCREENSAVER_INTERFACE,
-                          NULL,
-                          screensaver_proxy_ready_cb,
-                          manager);
-}
-
-static void
 screensaver_vanished_callback (GDBusConnection *connection,
                                const gchar *name,
                                gpointer user_data)
@@ -695,6 +665,10 @@
 
         g_debug ("Stopping automounting manager");
 
+        if (p->ss_proxy) {
+                g_signal_handlers_disconnect_by_data (p->ss_proxy, manager);
+        }
+
         g_clear_object (&p->session);
         g_clear_object (&p->volume_monitor);
         g_clear_object (&p->settings);
 
=== modified file 'plugins/background/gsd-background-manager.c'
--- plugins/background/gsd-background-manager.c	2013-11-13 01:43:03 +0000
+++ plugins/background/gsd-background-manager.c	2016-06-29 16:17:06 +0000
@@ -42,7 +42,7 @@
 #include <libgnome-desktop/gnome-bg.h>
 #include <X11/Xatom.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gnome-settings-profile.h"
 #include "gsd-background-manager.h"
 
@@ -335,7 +335,7 @@
 draw_background_after_session_loads (GsdBackgroundManager *manager)
 {
         manager->priv->proxy =
-                gnome_settings_session_get_session_proxy ();
+                G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
 
         manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
                                                            "g-signal",
 
=== modified file 'plugins/color/gsd-color-manager.c'
--- plugins/color/gsd-color-manager.c	2014-06-26 00:02:19 +0000
+++ plugins/color/gsd-color-manager.c	2016-06-29 16:17:06 +0000
@@ -31,7 +31,7 @@
 
 #include "gnome-settings-plugin.h"
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-color-manager.h"
 #include "gcm-profile-store.h"
 #include "gcm-dmi.h"
@@ -46,7 +46,7 @@
 
 struct GsdColorManagerPrivate
 {
-        GDBusProxy      *session;
+        GsdSessionManager *session;
         CdClient        *client;
         GSettings       *settings;
         GcmProfileStore *profile_store;
@@ -2142,7 +2142,7 @@
         priv = manager->priv = GSD_COLOR_MANAGER_GET_PRIVATE (manager);
 
         /* track the active session */
-        priv->session = gnome_settings_session_get_session_proxy ();
+        priv->session = gnome_settings_bus_get_session_proxy ();
         g_signal_connect (priv->session, "g-properties-changed",
                           G_CALLBACK (gcm_session_active_changed_cb), manager);
 
@@ -2196,6 +2196,8 @@
 
         manager = GSD_COLOR_MANAGER (object);
 
+        g_signal_handlers_disconnect_by_data (manager->priv->session, manager);
+
         g_clear_object (&manager->priv->settings);
         g_clear_object (&manager->priv->client);
         g_clear_object (&manager->priv->profile_store);
 
=== modified file 'plugins/common/gsd-input-helper.c'
--- plugins/common/gsd-input-helper.c	2015-10-07 16:32:40 +0000
+++ plugins/common/gsd-input-helper.c	2016-06-29 16:17:06 +0000
@@ -595,7 +595,10 @@
         guint *value, w, h;
         int i, n_info;
 
+        /* ignore errors, device might be removed before config is done as in #1503758 */
+        gdk_error_trap_push();
         info = XIQueryDevice (GDK_DISPLAY_XDISPLAY (display), deviceid, &n_info);
+        gdk_error_trap_pop_ignored ();
         *width = *height = w = h = 0;
 
         if (!info)
 
=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2016-01-21 10:58:12 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2016-06-29 16:17:06 +0000
@@ -55,7 +55,7 @@
 
 #include <act/act.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gnome-settings-profile.h"
 #include "gsd-keyboard-manager.h"
 #include "gsd-input-helper.h"
 
=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2015-12-01 15:39:26 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2016-06-29 16:17:06 +0000
@@ -48,7 +48,7 @@
 #endif
 
 #include "gnome-settings-plugin.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gnome-settings-profile.h"
 #include "gsd-marshal.h"
 #include "gsd-media-keys-manager.h"
@@ -80,10 +80,6 @@
 #define GNOME_KEYRING_DBUS_PATH "/org/gnome/keyring/daemon"
 #define GNOME_KEYRING_DBUS_INTERFACE "org.gnome.keyring.Daemon"
 
-#define GS_DBUS_NAME                            "org.gnome.ScreenSaver"
-#define GS_DBUS_PATH                            "/org/gnome/ScreenSaver"
-#define GS_DBUS_INTERFACE                       "org.gnome.ScreenSaver"
-
 #define SHELL_DBUS_NAME "org.gnome.Shell"
 #define SHELL_DBUS_PATH "/org/gnome/Shell"
 
@@ -203,6 +199,9 @@
         GCancellable    *shell_cancellable;
         GCancellable    *grab_cancellable;
 
+        /* ScreenSaver stuff */
+        GsdScreenSaver  *screen_saver_proxy;
+
         /* systemd stuff */
         GDBusProxy      *logind_proxy;
         gint             inhibit_keys_fd;
@@ -1160,7 +1159,7 @@
 	GVariant *variant;
         GDBusProxy *proxy;
 
-        proxy = gnome_settings_session_get_session_proxy ();
+        proxy = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
 	variant = g_dbus_proxy_call_sync (proxy,
 					  "Shutdown",
 					  NULL,
@@ -1339,22 +1338,34 @@
 }
 
 static void
+on_screen_locked (GsdScreenSaver      *screen_saver,
+                  GAsyncResult        *result,
+                  GsdMediaKeysManager *manager)
+{
+        gboolean is_locked;
+        GError *error = NULL;
+
+        is_locked = gsd_screen_saver_call_lock_finish (screen_saver, result, &error);
+
+        if (!is_locked) {
+                g_warning ("Couldn't lock screen: %s", error->message);
+                g_error_free (error);
+                return;
+        }
+}
+
+static void
 do_lock_screensaver (GsdMediaKeysManager *manager)
 {
         GsdMediaKeysManagerPrivate *priv = manager->priv;
 
-        if (priv->connection == NULL) {
-                g_warning ("No existing D-Bus connection trying to handle screensaver lock key");
-                return;
-        }
-        g_dbus_connection_call (manager->priv->connection,
-                                GS_DBUS_NAME,
-                                GS_DBUS_PATH,
-                                GS_DBUS_INTERFACE,
-                                "Lock",
-                                NULL, NULL,
-                                G_DBUS_CALL_FLAGS_NONE, -1,
-                                NULL, NULL, NULL);
+        if (priv->screen_saver_proxy == NULL)
+                priv->screen_saver_proxy = gnome_settings_bus_get_screen_saver_proxy ();
+
+        gsd_screen_saver_call_lock (priv->screen_saver_proxy,
+                                    priv->cancellable,
+                                    (GAsyncReadyCallback) on_screen_locked,
+                                    manager);
 }
 
 static void
@@ -3415,6 +3426,8 @@
         if (media_keys_manager->priv->inhibit_keys_fd != -1)
                 close (media_keys_manager->priv->inhibit_keys_fd);
 
+        g_clear_object (&media_keys_manager->priv->screen_saver_proxy);
+
         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
 }
 
 
=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2016-06-29 15:38:15 +0000
+++ plugins/power/gsd-power-manager.c	2016-06-29 16:17:06 +0000
@@ -43,7 +43,7 @@
 #include "gpm-common.h"
 #include "gnome-settings-plugin.h"
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-enums.h"
 #include "gsd-power-manager.h"
 #include "gsd-rr.h"
@@ -68,10 +68,6 @@
 #define GSD_POWER_DBUS_INTERFACE_SCREEN         GSD_POWER_DBUS_INTERFACE ".Screen"
 #define GSD_POWER_DBUS_INTERFACE_KEYBOARD       GSD_POWER_DBUS_INTERFACE ".Keyboard"
 
-#define GS_DBUS_NAME                            "org.gnome.ScreenSaver"
-#define GS_DBUS_PATH                            "/org/gnome/ScreenSaver"
-#define GS_DBUS_INTERFACE                       "org.gnome.ScreenSaver"
-
 #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT          10 * 1000 /* ms */
 #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG           30 * 1000 /* ms */
 
@@ -144,7 +140,7 @@
 struct GsdPowerManagerPrivate
 {
         /* D-Bus */
-        GDBusProxy              *session;
+        GsdSessionManager       *session;
         guint                    name_id;
         GDBusNodeInfo           *introspection_data;
         GDBusConnection         *connection;
@@ -153,7 +149,7 @@
 
         /* Settings */
         GSettings               *settings;
-        GSettings               *settings_session;
+        GSettings               *settings_bus;
         GSettings               *settings_screensaver;
         GSettings               *settings_xrandr;
 
@@ -166,9 +162,7 @@
         guint                    low_time;
 
         /* Screensaver */
-        guint                    screensaver_watch_id;
-        GCancellable            *screensaver_cancellable;
-        GDBusProxy              *screensaver_proxy;
+        GsdScreenSaver          *screensaver_proxy;
         gboolean                 screensaver_active;
 
         /* State */
@@ -192,7 +186,6 @@
 
         /* Keyboard */
         GDBusProxy              *upower_kdb_proxy;
-        gint                     kbd_brightness_now;
         gint                     kbd_brightness_max;
         gint                     kbd_brightness_old;
         gint                     kbd_brightness_pre_dim;
@@ -912,8 +905,6 @@
         guint i;
         GPtrArray *array = NULL;
         UpDevice *device;
-        gboolean ret;
-        GError *error = NULL;
 
         engine_recalculate_state (manager);
 
@@ -1739,7 +1730,7 @@
 static void
 gnome_session_shutdown (GsdPowerManager *manager)
 {
-        g_dbus_proxy_call (manager->priv->session,
+        g_dbus_proxy_call (G_DBUS_PROXY (manager->priv->session),
                            "Shutdown",
                            NULL,
                            G_DBUS_CALL_FLAGS_NONE,
@@ -1771,7 +1762,7 @@
 gnome_session_logout (GsdPowerManager *manager,
                       guint            logout_mode)
 {
-        g_dbus_proxy_call (manager->priv->session,
+        g_dbus_proxy_call (G_DBUS_PROXY (manager->priv->session),
                            "Logout",
                            g_variant_new ("(u)", logout_mode),
                            G_DBUS_CALL_FLAGS_NONE,
@@ -1931,14 +1922,41 @@
 }
 
 static gboolean
+upower_kbd_get_brightness (GsdPowerManager *manager)
+{
+        GVariant *k_now = NULL;
+        GError *error = NULL;
+        gint now;
+
+        k_now = g_dbus_proxy_call_sync (manager->priv->upower_kdb_proxy,
+                                        "GetBrightness",
+                                        NULL,
+                                        G_DBUS_CALL_FLAGS_NONE,
+                                        -1,
+                                        NULL,
+                                        &error);
+        if (k_now == NULL) {
+                if (error->domain != G_DBUS_ERROR ||
+                    error->code != G_DBUS_ERROR_UNKNOWN_METHOD) {
+                        g_warning ("Failed to get brightness: %s",
+                                   error->message);
+                }
+
+                g_error_free (error);
+                return -1;
+        }
+
+        g_variant_get (k_now, "(i)", &now);
+        g_variant_unref (k_now);
+
+        return now;
+}
+
+static gboolean
 upower_kbd_set_brightness (GsdPowerManager *manager, guint value, GError **error)
 {
         GVariant *retval;
 
-        /* same as before */
-        if (manager->priv->kbd_brightness_now == value)
-                return TRUE;
-
         /* update h/w value */
         retval = g_dbus_proxy_call_sync (manager->priv->upower_kdb_proxy,
                                          "SetBrightness",
@@ -1950,17 +1968,16 @@
         if (retval == NULL)
                 return FALSE;
 
-        /* save new value */
-        manager->priv->kbd_brightness_now = value;
         g_variant_unref (retval);
         return TRUE;
 }
 
-static gboolean
+static int
 upower_kbd_toggle (GsdPowerManager *manager,
                    GError **error)
 {
         gboolean ret;
+        int value = -1;
 
         if (manager->priv->kbd_brightness_old >= 0) {
                 g_debug ("keyboard toggle off");
@@ -1970,19 +1987,24 @@
                 if (ret) {
                         /* succeeded, set to -1 since now no old value */
                         manager->priv->kbd_brightness_old = -1;
+                        value = 0;
                 }
         } else {
                 g_debug ("keyboard toggle on");
                 /* save the current value to restore later when untoggling */
-                manager->priv->kbd_brightness_old = manager->priv->kbd_brightness_now;
+                manager->priv->kbd_brightness_old = upower_kbd_get_brightness (manager);
                 ret = upower_kbd_set_brightness (manager, 0, error);
                 if (!ret) {
                         /* failed, reset back to -1 */
                         manager->priv->kbd_brightness_old = -1;
+                } else {
+                        value = 0;
                 }
         }
 
-        return ret;
+        if (ret)
+                return value;
+        return -1;
 }
 
 static gboolean
@@ -2057,7 +2079,7 @@
         }
 
         if (policy == GSD_POWER_ACTION_NOTHING) {
-		inhibit_lid_switch (manager);
+                inhibit_lid_switch (manager);
                 manager->priv->inhibit_lid_switch_action = TRUE;
         } else {
                 uninhibit_lid_switch (manager);
@@ -2088,7 +2110,7 @@
         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
                                           "lock-enabled");
         if (!do_lock) {
-                g_dbus_proxy_call_sync (manager->priv->screensaver_proxy,
+                g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->screensaver_proxy),
                                         "SetActive",
                                         g_variant_new ("(b)", TRUE),
                                         G_DBUS_CALL_FLAGS_NONE,
@@ -2096,7 +2118,7 @@
                 return;
         }
 
-        g_dbus_proxy_call_sync (manager->priv->screensaver_proxy,
+        g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->screensaver_proxy),
                                 "Lock",
                                 NULL,
                                 G_DBUS_CALL_FLAGS_NONE,
@@ -2275,7 +2297,7 @@
         if (manager->priv->upower_kdb_proxy == NULL)
                 return TRUE;
 
-        now = manager->priv->kbd_brightness_now;
+        now = upower_kbd_get_brightness (manager);
         max = manager->priv->kbd_brightness_max;
         idle = PERCENTAGE_TO_ABS (0, max, idle_percentage);
         if (idle > now) {
@@ -2299,7 +2321,7 @@
         GVariant *variant;
         gboolean is_session_active = FALSE;
 
-        variant = g_dbus_proxy_get_cached_property (manager->priv->session,
+        variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (manager->priv->session),
                                                     "SessionIsActive");
         if (variant) {
                 is_session_active = g_variant_get_boolean (variant);
@@ -2384,8 +2406,7 @@
                 /* only toggle keyboard if present and not already toggled */
                 if (manager->priv->upower_kdb_proxy &&
                     manager->priv->kbd_brightness_old == -1) {
-                        ret = upower_kbd_toggle (manager, &error);
-                        if (!ret) {
+                        if (upower_kbd_toggle (manager, &error) < 0) {
                                 g_warning ("failed to turn the kbd backlight off: %s",
                                            error->message);
                                 g_error_free (error);
@@ -2427,8 +2448,7 @@
                 /* only toggle keyboard if present and already toggled off */
                 if (manager->priv->upower_kdb_proxy &&
                     manager->priv->kbd_brightness_old != -1) {
-                        ret = upower_kbd_toggle (manager, &error);
-                        if (!ret) {
+                        if (upower_kbd_toggle (manager, &error) < 0) {
                                 g_warning ("failed to turn the kbd backlight on: %s",
                                            error->message);
                                 g_clear_error (&error);
@@ -2464,7 +2484,7 @@
         if (manager->priv->session == NULL)
                 return FALSE;
 
-        variant = g_dbus_proxy_get_cached_property (manager->priv->session,
+        variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (manager->priv->session),
                                                     "InhibitedActions");
         if (!variant)
                 return FALSE;
@@ -2598,7 +2618,7 @@
                 timeout_dim = SCREENSAVER_TIMEOUT_BLANK;
         } else {
                 if (g_settings_get_boolean (manager->priv->settings, "idle-dim")) {
-                        timeout_dim = g_settings_get_uint (manager->priv->settings_session,
+                        timeout_dim = g_settings_get_uint (manager->priv->settings_bus,
                                                            "idle-delay");
                         if (timeout_dim == 0) {
                                 timeout_dim = IDLE_DIM_BLANK_DISABLED_MIN;
@@ -2765,88 +2785,10 @@
 }
 
 static void
-get_active_cb (GDBusProxy *proxy,
-               GAsyncResult *result,
-               GsdPowerManager *manager)
-{
-        GVariant *res;
-        GError *error = NULL;
-
-        res = g_dbus_proxy_call_finish (proxy, result, &error);
-        if (!res) {
-                g_warning ("Failed to run GetActive() function on screensaver: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        handle_screensaver_active (manager, res);
-        g_variant_unref (res);
-}
-
-static void
-screensaver_proxy_ready_cb (GObject         *source_object,
-                            GAsyncResult    *res,
-                            GsdPowerManager *manager)
-{
-        GError *error = NULL;
-        GDBusProxy *proxy;
-
-        proxy = g_dbus_proxy_new_finish (res, &error);
-
-        if (proxy == NULL) {
-                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                        g_warning ("Could not connect to screensaver: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        manager->priv->screensaver_proxy = proxy;
-
-        g_signal_connect (manager->priv->screensaver_proxy, "g-signal",
-                          G_CALLBACK (screensaver_signal_cb), manager);
-        g_dbus_proxy_call (manager->priv->screensaver_proxy,
-                           "GetActive",
-                           NULL,
-                           0,
-                           G_MAXINT,
-                           NULL,
-                           (GAsyncReadyCallback)get_active_cb,
-                           manager);
-
-}
-
-static void
-screensaver_appeared_cb (GDBusConnection *connection,
-                         const char      *name,
-                         const char      *name_owner,
-                         GsdPowerManager *manager)
-{
-        g_dbus_proxy_new (connection,
-                          0,
-                          NULL,
-                          GS_DBUS_NAME,
-                          GS_DBUS_PATH,
-                          GS_DBUS_INTERFACE,
-                          manager->priv->screensaver_cancellable,
-                          (GAsyncReadyCallback) screensaver_proxy_ready_cb,
-                          manager);
-
-}
-
-static void
-screensaver_vanished_cb (GDBusConnection *connection,
-                         const char      *name,
-                         GsdPowerManager *manager)
-{
-        g_clear_object (&manager->priv->screensaver_proxy);
-}
-
-static void
 power_keyboard_proxy_ready_cb (GObject             *source_object,
                                GAsyncResult        *res,
                                gpointer             user_data)
 {
-        GVariant *k_now = NULL;
         GVariant *k_max = NULL;
         GError *error = NULL;
         GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
@@ -2859,23 +2801,6 @@
                 goto out;
         }
 
-        k_now = g_dbus_proxy_call_sync (manager->priv->upower_kdb_proxy,
-                                        "GetBrightness",
-                                        NULL,
-                                        G_DBUS_CALL_FLAGS_NONE,
-                                        -1,
-                                        NULL,
-                                        &error);
-        if (k_now == NULL) {
-                if (error->domain != G_DBUS_ERROR ||
-                    error->code != G_DBUS_ERROR_UNKNOWN_METHOD) {
-                        g_warning ("Failed to get brightness: %s",
-                                   error->message);
-                }
-                g_error_free (error);
-                goto out;
-        }
-
         k_max = g_dbus_proxy_call_sync (manager->priv->upower_kdb_proxy,
                                         "GetMaxBrightness",
                                         NULL,
@@ -2884,17 +2809,20 @@
                                         NULL,
                                         &error);
         if (k_max == NULL) {
-                g_warning ("Failed to get max brightness: %s", error->message);
+                if (error->domain != G_DBUS_ERROR ||
+                    error->code != G_DBUS_ERROR_UNKNOWN_METHOD) {
+                        g_warning ("Failed to get max brightness: %s",
+                                   error->message);
+                }
                 g_error_free (error);
                 goto out;
         }
 
-        g_variant_get (k_now, "(i)", &manager->priv->kbd_brightness_now);
         g_variant_get (k_max, "(i)", &manager->priv->kbd_brightness_max);
 
         /* set brightness to max if not currently set so is something
          * sensible */
-        if (manager->priv->kbd_brightness_now < 0) {
+        if (upower_kbd_get_brightness (manager) < 0) {
                 gboolean ret;
                 ret = upower_kbd_set_brightness (manager,
                                                  manager->priv->kbd_brightness_max,
@@ -2907,8 +2835,6 @@
                 }
         }
 out:
-        if (k_now != NULL)
-                g_variant_unref (k_now);
         if (k_max != NULL)
                 g_variant_unref (k_max);
 }
@@ -3304,11 +3230,16 @@
         inhibit_suspend (manager);
 
         /* track the active session */
-        manager->priv->session = gnome_settings_session_get_session_proxy ();
+        manager->priv->session = gnome_settings_bus_get_session_proxy ();
         g_signal_connect (manager->priv->session, "g-properties-changed",
                           G_CALLBACK (engine_session_properties_changed_cb),
                           manager);
 
+        manager->priv->screensaver_proxy = gnome_settings_bus_get_screen_saver_proxy ();
+
+        g_signal_connect (manager->priv->screensaver_proxy, "g-signal",
+                          G_CALLBACK (screensaver_signal_cb), manager);
+
         manager->priv->kbd_brightness_old = -1;
         manager->priv->kbd_brightness_pre_dim = -1;
         manager->priv->pre_dim_brightness = -1;
@@ -3316,8 +3247,8 @@
         g_signal_connect (manager->priv->settings, "changed",
                           G_CALLBACK (engine_settings_key_changed_cb), manager);
         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-        manager->priv->settings_session = g_settings_new ("org.gnome.desktop.session");
-        g_signal_connect (manager->priv->settings_session, "changed",
+        manager->priv->settings_bus = g_settings_new ("org.gnome.desktop.session");
+        g_signal_connect (manager->priv->settings_bus, "changed",
                           G_CALLBACK (engine_settings_key_changed_cb), manager);
         manager->priv->settings_xrandr = g_settings_new (GSD_XRANDR_SETTINGS_SCHEMA);
         manager->priv->up_client = up_client_new ();
@@ -3355,15 +3286,6 @@
                                   session_presence_proxy_ready_cb,
                                   manager);
 
-        manager->priv->screensaver_watch_id =
-                g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                  GS_DBUS_NAME,
-                                  G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                  (GBusNameAppearedCallback) screensaver_appeared_cb,
-                                  (GBusNameVanishedCallback) screensaver_vanished_cb,
-                                  manager,
-                                  NULL);
-
         manager->priv->devices_array = g_ptr_array_new_with_free_func (g_object_unref);
 
         /* create a fake virtual composite battery */
@@ -3440,16 +3362,6 @@
                 manager->priv->inhibit_lid_switch_timer_id = 0;
         }
 
-        if (manager->priv->screensaver_cancellable != NULL) {
-                g_cancellable_cancel (manager->priv->screensaver_cancellable);
-                g_clear_object (&manager->priv->screensaver_cancellable);
-        }
-
-        if (manager->priv->screensaver_watch_id != 0) {
-                g_bus_unwatch_name (manager->priv->screensaver_watch_id);
-                manager->priv->screensaver_watch_id = 0;
-        }
-
         if (manager->priv->bus_cancellable != NULL) {
                 g_cancellable_cancel (manager->priv->bus_cancellable);
                 g_object_unref (manager->priv->bus_cancellable);
@@ -3466,7 +3378,7 @@
         g_clear_object (&manager->priv->session);
         g_clear_object (&manager->priv->settings);
         g_clear_object (&manager->priv->settings_screensaver);
-        g_clear_object (&manager->priv->settings_session);
+        g_clear_object (&manager->priv->settings_bus);
         g_clear_object (&manager->priv->up_client);
 
         if (manager->priv->inhibit_lid_switch_fd != -1) {
@@ -3519,7 +3431,6 @@
         manager->priv->inhibit_lid_switch_fd = -1;
         manager->priv->inhibit_suspend_fd = -1;
         manager->priv->inhibit_lid_switch_action = FALSE;
-        manager->priv->screensaver_cancellable = g_cancellable_new ();
         manager->priv->bus_cancellable = g_cancellable_new ();
 }
 
@@ -3530,6 +3441,7 @@
                              GVariant *parameters,
                              GDBusMethodInvocation *invocation)
 {
+        gint now;
         gint step;
         gint value = -1;
         gboolean ret;
@@ -3538,19 +3450,23 @@
 
         if (g_strcmp0 (method_name, "StepUp") == 0) {
                 g_debug ("keyboard step up");
+                now = upower_kbd_get_brightness (manager);
                 step = BRIGHTNESS_STEP_AMOUNT (manager->priv->kbd_brightness_max);
-                value = MIN (manager->priv->kbd_brightness_now + step,
+                value = MIN (now + step,
                              manager->priv->kbd_brightness_max);
                 ret = upower_kbd_set_brightness (manager, value, &error);
 
         } else if (g_strcmp0 (method_name, "StepDown") == 0) {
                 g_debug ("keyboard step down");
+                now = upower_kbd_get_brightness (manager);
                 step = BRIGHTNESS_STEP_AMOUNT (manager->priv->kbd_brightness_max);
-                value = MAX (manager->priv->kbd_brightness_now - step, 0);
+                value = MAX (now - step, 0);
                 ret = upower_kbd_set_brightness (manager, value, &error);
 
         } else if (g_strcmp0 (method_name, "Toggle") == 0) {
-                ret = upower_kbd_toggle (manager, &error);
+                value = upower_kbd_toggle (manager, &error);
+                ret = (value >= 0);
+
         } else {
                 g_assert_not_reached ();
         }
 
=== modified file 'plugins/remote-display/gsd-remote-display-manager.c'
--- plugins/remote-display/gsd-remote-display-manager.c	2013-02-16 04:55:53 +0000
+++ plugins/remote-display/gsd-remote-display-manager.c	2016-06-29 16:17:06 +0000
@@ -35,7 +35,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gnome-settings-profile.h"
 #include "gsd-remote-display-manager.h"
 
 
=== modified file 'plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c'
--- plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c	2013-09-03 02:41:55 +0000
+++ plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c	2016-06-29 16:17:06 +0000
@@ -28,15 +28,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include <locale.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gdk/gdk.h>
-
-#include "gnome-settings-session.h"
+#include <gio/gio.h>
+
+#include "gnome-settings-bus.h"
 #include "gnome-settings-profile.h"
 #include "gsd-screensaver-proxy-manager.h"
+#include "gsd-idle-monitor.h"
 
 #define GSD_SCREENSAVER_PROXY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_SCREENSAVER_PROXY_MANAGER, GsdScreensaverProxyManagerPrivate))
 
@@ -134,7 +131,8 @@
 
 struct GsdScreensaverProxyManagerPrivate
 {
-        GDBusProxy              *session;
+        GsdSessionManager       *session;
+        GsdScreenSaver          *screensaver;
         GDBusConnection         *connection;
         GCancellable            *bus_cancellable;
         GDBusNodeInfo           *introspection_data;
@@ -169,7 +167,7 @@
                 if (g_strcmp0 (sender, name) == 0) {
                         guint cookie = GPOINTER_TO_UINT (cookie_ptr);
 
-                        g_dbus_proxy_call_sync (manager->priv->session,
+                        g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->session),
                                                 "Uninhibit",
                                                 g_variant_new ("(u)", cookie),
                                                 G_DBUS_CALL_FLAGS_NONE,
@@ -194,18 +192,19 @@
                     gpointer               user_data)
 {
         GsdScreensaverProxyManager *manager = GSD_SCREENSAVER_PROXY_MANAGER (user_data);
+        GError *error = NULL;
+        GVariant *ret = NULL;
 
         /* Check session pointer as a proxy for whether the manager is in the
            start or stop state */
-        if (manager->priv->session == NULL) {
-                return;
+        if (manager->priv->session == NULL || manager->priv->screensaver == NULL) {
+                goto unimplemented;
         }
 
         g_debug ("Calling method '%s.%s' for ScreenSaver Proxy",
                  interface_name, method_name);
 
         if (g_strcmp0 (method_name, "Inhibit") == 0) {
-                GVariant *ret;
                 const char *app_id;
                 const char *reason;
                 guint cookie;
@@ -213,12 +212,12 @@
                 g_variant_get (parameters,
                                "(ss)", &app_id, &reason);
 
-                ret = g_dbus_proxy_call_sync (manager->priv->session,
+                ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->session),
                                               "Inhibit",
                                               g_variant_new ("(susu)",
                                                              app_id, 0, reason, GSM_INHIBITOR_FLAG_IDLE),
                                               G_DBUS_CALL_FLAGS_NONE,
-                                              -1, NULL, NULL);
+                                              -1, NULL, &error);
                 g_variant_get (ret, "(u)", &cookie);
                 g_hash_table_insert (manager->priv->cookie_ht,
                                      GUINT_TO_POINTER (cookie),
@@ -237,36 +236,52 @@
                                              g_strdup (sender),
                                              GUINT_TO_POINTER (watch_id));
                 }
-                g_dbus_method_invocation_return_value (invocation, ret);
         } else if (g_strcmp0 (method_name, "UnInhibit") == 0) {
                 guint cookie;
 
                 g_variant_get (parameters, "(u)", &cookie);
-                g_dbus_proxy_call_sync (manager->priv->session,
+                g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->session),
                                         "Uninhibit",
                                         parameters,
                                         G_DBUS_CALL_FLAGS_NONE,
                                         -1, NULL, NULL);
                 g_debug ("Removing cookie %u from the list for %s", cookie, sender);
                 g_hash_table_remove (manager->priv->cookie_ht, GUINT_TO_POINTER (cookie));
-                g_dbus_method_invocation_return_value (invocation, NULL);
-        } else if (g_strcmp0 (method_name, "Throttle") == 0) {
-                g_dbus_method_invocation_return_value (invocation, NULL);
-        } else if (g_strcmp0 (method_name, "UnThrottle") == 0) {
-                g_dbus_method_invocation_return_value (invocation, NULL);
-        } else if (g_strcmp0 (method_name, "Lock") == 0) {
-                goto unimplemented;
-        } else if (g_strcmp0 (method_name, "SimulateUserActivity") == 0) {
-                goto unimplemented;
-        } else if (g_strcmp0 (method_name, "GetActive") == 0) {
-                goto unimplemented;
-        } else if (g_strcmp0 (method_name, "GetActiveTime") == 0) {
-                goto unimplemented;
+        } else if (g_strcmp0 (method_name, "Lock") == 0 ||
+                   g_strcmp0 (method_name, "SimulateUserActivity") == 0 ||
+                   g_strcmp0 (method_name, "GetActive") == 0 ||
+                   g_strcmp0 (method_name, "GetActiveTime") == 0 ||
+                   g_strcmp0 (method_name, "SetActive") == 0) {
+
+                ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->screensaver),
+                                              method_name,
+                                              parameters,
+                                              G_DBUS_CALL_FLAGS_NONE,
+                                              -1, NULL, &error);
+
+                if (error == NULL && g_strcmp0 (method_name, "SetActive") == 0) {
+                        g_variant_unref (ret);
+
+                        /* Returning the actual Activate state here is not possible,
+                         * as calling GetActive at this point might return an invalid
+                         * value if the activation process is still ongoing. */
+                        ret = g_variant_ref (parameters);
+                }
         } else if (g_strcmp0 (method_name, "GetSessionIdleTime") == 0) {
-                goto unimplemented;
-        } else if (g_strcmp0 (method_name, "SetActive") == 0) {
-                goto unimplemented;
-        }
+                GsdIdleMonitor *idle_monitor = gsd_idle_monitor_get_core ();
+                gint64 idle_time_ms = gsd_idle_monitor_get_idletime (idle_monitor);
+                ret = g_variant_new ("(u)", idle_time_ms / 1000);
+        } else {
+                goto unimplemented;
+        }
+
+        if (error != NULL) {
+                g_dbus_method_invocation_return_gerror (invocation, error);
+                g_error_free (error);
+                return;
+        }
+
+        g_dbus_method_invocation_return_value (invocation, ret);
 
         return;
 
@@ -353,7 +368,9 @@
         g_debug ("Starting screensaver-proxy manager");
         gnome_settings_profile_start (NULL);
         manager->priv->session =
-                gnome_settings_session_get_session_proxy ();
+                gnome_settings_bus_get_session_proxy ();
+        manager->priv->screensaver =
+                gnome_settings_bus_get_screen_saver_proxy ();
         manager->priv->watch_ht = g_hash_table_new_full (g_str_hash,
                                                          g_str_equal,
                                                          (GDestroyNotify) g_free,
@@ -371,6 +388,7 @@
 {
         g_debug ("Stopping screensaver_proxy manager");
         g_clear_object (&manager->priv->session);
+        g_clear_object (&manager->priv->screensaver);
         g_clear_pointer (&manager->priv->watch_ht, g_hash_table_destroy);
         g_clear_pointer (&manager->priv->cookie_ht, g_hash_table_destroy);
 }
@@ -403,6 +421,8 @@
 
         g_return_if_fail (manager->priv != NULL);
 
+        gsd_screensaver_proxy_manager_stop (manager);
+
         if (manager->priv->name_id != 0) {
                 g_bus_unown_name (manager->priv->name_id);
                 manager->priv->name_id = 0;
 
=== modified file 'plugins/smartcard/gsd-smartcard-plugin.c'
--- plugins/smartcard/gsd-smartcard-plugin.c	2012-10-22 08:00:50 +0000
+++ plugins/smartcard/gsd-smartcard-plugin.c	2016-06-29 16:17:06 +0000
@@ -28,13 +28,12 @@
 #include <gio/gio.h>
 
 #include "gnome-settings-plugin.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-smartcard-plugin.h"
 #include "gsd-smartcard-manager.h"
 
 struct GsdSmartcardPluginPrivate {
         GsdSmartcardManager *manager;
-        GDBusConnection     *bus_connection;
 
         guint32              is_active : 1;
 };
@@ -46,10 +45,6 @@
     GSD_SMARTCARD_REMOVE_ACTION_FORCE_LOGOUT,
 } GsdSmartcardRemoveAction;
 
-#define SCREENSAVER_DBUS_NAME      "org.gnome.ScreenSaver"
-#define SCREENSAVER_DBUS_PATH      "/"
-#define SCREENSAVER_DBUS_INTERFACE "org.gnome.ScreenSaver"
-
 #define SM_LOGOUT_MODE_FORCE 2
 
 #define KEY_REMOVE_ACTION "removal-action"
@@ -61,20 +56,13 @@
 static void
 simulate_user_activity (GsdSmartcardPlugin *plugin)
 {
+        GsdScreenSaver *screensaver_proxy;
         GDBusProxy *screensaver_proxy;
 
         g_debug ("GsdSmartcardPlugin telling screensaver about smart card insertion");
-        screensaver_proxy = g_dbus_proxy_new_sync (plugin->priv->bus_connection,
-                                                   0, NULL,
-                                                   SCREENSAVER_DBUS_NAME,
-                                                   SCREENSAVER_DBUS_PATH,
-                                                   SCREENSAVER_DBUS_INTERFACE,
-                                                   NULL, NULL);
-
-        g_dbus_proxy_call (screensaver_proxy,
-                           "SimulateUserActivity",
-                           NULL, G_DBUS_CALL_FLAGS_NONE,
-                           -1, NULL, NULL, NULL);
+        screensaver_proxy = gnome_settings_bus_get_screen_saver_proxy ();
+        gsd_screen_saver_call_simulate_user_activity_sync (screensaver_proxy,
+                                                           NULL, NULL);
 
         g_object_unref (screensaver_proxy);
 }
@@ -85,17 +73,8 @@
         GDBusProxy *screensaver_proxy;
 
         g_debug ("GsdSmartcardPlugin telling screensaver to lock screen");
-        screensaver_proxy = g_dbus_proxy_new_sync (plugin->priv->bus_connection,
-                                                   0, NULL,
-                                                   SCREENSAVER_DBUS_NAME,
-                                                   SCREENSAVER_DBUS_PATH,
-                                                   SCREENSAVER_DBUS_INTERFACE,
-                                                   NULL, NULL);
-
-        g_dbus_proxy_call (screensaver_proxy,
-                           "Lock",
-                           NULL, G_DBUS_CALL_FLAGS_NONE,
-                           -1, NULL, NULL, NULL);
+        screensaver_proxy = gnome_settings_bus_get_screen_saver_proxy ();
+        gsd_screen_saver_call_lock_sync (screensaver_proxy, NULL, NULL);
 
         g_object_unref (screensaver_proxy);
 }
@@ -108,7 +87,7 @@
         GVariant   *res;
 
         g_debug ("GsdSmartcardPlugin telling session manager to force logout");
-        sm_proxy = gnome_settings_session_get_session_proxy ();
+        sm_proxy = gnome_settings_bus_get_session_proxy ();
 
         error = NULL;
         res = g_dbus_proxy_call_sync (sm_proxy,
@@ -269,13 +248,6 @@
         g_debug ("GsdSmartcardPlugin Activating smartcard plugin");
 
         error = NULL;
-        smartcard_plugin->priv->bus_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-
-        if (smartcard_plugin->priv->bus_connection == NULL) {
-                g_warning ("GsdSmartcardPlugin Unable to connect to session bus: %s", error->message);
-                return;
-        }
-
         if (!gsd_smartcard_manager_start (smartcard_plugin->priv->manager, &error)) {
                 g_warning ("GsdSmartcardPlugin Unable to start smartcard manager: %s", error->message);
                 g_error_free (error);
@@ -318,7 +290,6 @@
 
         g_signal_handlers_disconnect_by_func (smartcard_plugin->priv->manager,
                                               smartcard_inserted_cb, smartcard_plugin);
-        smartcard_plugin->priv->bus_connection = NULL;
         smartcard_plugin->priv->is_active = FALSE;
 }
 
 
=== modified file 'plugins/updates/gsd-updates-manager.c'
--- plugins/updates/gsd-updates-manager.c	2013-09-05 09:48:46 +0000
+++ plugins/updates/gsd-updates-manager.c	2016-06-29 16:17:06 +0000
@@ -35,7 +35,7 @@
 #include "gsd-updates-refresh.h"
 #include "gsd-updates-common.h"
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 
 #define GSD_UPDATES_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_MANAGER, GsdUpdatesManagerPrivate))
 
@@ -60,7 +60,7 @@
         PkControl               *control;
         PkTask                  *task;
         guint                    inhibit_cookie;
-        GDBusProxy              *proxy_session;
+        GsdSessionManager       *proxy_session;
         guint                    update_viewer_watcher_id;
         GVolumeMonitor          *volume_monitor;
         guint                    failed_get_updates_count;
@@ -975,7 +975,7 @@
 
         /* TRANSLATORS: the reason why we've inhibited it */
         reason = _("A transaction that cannot be interrupted is running");
-        retval = g_dbus_proxy_call_sync (manager->priv->proxy_session,
+        retval = g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->proxy_session),
                                          "Inhibit",
                                          g_variant_new ("(susu)",
                                                         "gnome-settings-daemon", /* app-id */
@@ -1012,7 +1012,7 @@
                 g_warning ("not locked");
                 goto out;
         }
-        retval = g_dbus_proxy_call_sync (manager->priv->proxy_session,
+        retval = g_dbus_proxy_call_sync (G_DBUS_PROXY (manager->priv->proxy_session),
                                          "Uninhibit",
                                          g_variant_new ("(u)",
                                                         manager->priv->inhibit_cookie),
@@ -1328,7 +1328,7 @@
 
         /* use gnome-session for the idle detection */
         manager->priv->proxy_session =
-                gnome_settings_session_get_session_proxy ();
+                gnome_settings_bus_get_session_proxy ();
         if (manager->priv->proxy_session == NULL)
                 goto out;
 
 
=== modified file 'plugins/updates/gsd-updates-refresh.c'
--- plugins/updates/gsd-updates-refresh.c	2013-05-28 08:37:55 +0000
+++ plugins/updates/gsd-updates-refresh.c	2016-06-29 16:17:06 +0000
@@ -25,7 +25,7 @@
 #include <packagekit-glib2/packagekit.h>
 #include <libupower-glib/upower.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 
 #include "gsd-updates-common.h"
 #include "gsd-updates-refresh.h"
@@ -64,7 +64,7 @@
         guint                    periodic_id;
         UpClient                *client;
         GSettings               *settings;
-        GDBusProxy              *proxy_session;
+        GsdSessionManager       *proxy_session;
         PkControl               *control;
 };
 
@@ -506,13 +506,13 @@
 
         /* use gnome-session for the idle detection */
         refresh->priv->proxy_session =
-                gnome_settings_session_get_session_proxy ();
+                gnome_settings_bus_get_session_proxy ();
         if (refresh->priv->proxy_session != NULL) {
-                g_signal_connect (refresh->priv->proxy_session,
+                g_signal_connect (G_DBUS_PROXY (refresh->priv->proxy_session),
                                   "g-signal",
                                   G_CALLBACK (session_presence_signal_cb),
                                   refresh);
-                status = g_dbus_proxy_get_cached_property (refresh->priv->proxy_session,
+                status = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (refresh->priv->proxy_session),
                                                            "status");
                 if (status) {
                         g_variant_get (status, "u", &status_code);
 
=== modified file 'plugins/wacom/gsd-wacom-manager.c'
--- plugins/wacom/gsd-wacom-manager.c	2015-10-22 10:52:11 +0000
+++ plugins/wacom/gsd-wacom-manager.c	2016-06-29 16:17:06 +0000
@@ -167,6 +167,8 @@
 	XDevice *xdev;
 
 	xdev = open_device (device);
+	if (xdev == NULL)
+		return;
 	device_set_property (xdev, gsd_wacom_device_get_tool_name (device), property);
 	xdevice_close (xdev);
 }
@@ -310,6 +312,8 @@
 	XDevice *xdev;
 
 	xdev = open_device (device);
+	if (xdev == NULL)
+		return;
 	gdk_error_trap_push ();
 	XSetDeviceMode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdev, is_absolute ? Absolute : Relative);
 	if (gdk_error_trap_pop ())
@@ -438,6 +442,8 @@
 	int i, j, rc;
 
 	xdev = open_device (device);
+	if (xdev == NULL)
+		return;
 
 	intmap = g_variant_get_fixed_array (value, &nmap, sizeof (gint32));
 	map = g_new0 (unsigned char, nmap);
@@ -661,6 +667,8 @@
 
 	/* Normal buttons */
 	xdev = open_device (device);
+	if (xdev == NULL)
+		return;
 
 	gdk_error_trap_push ();
 
 
=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2015-10-07 16:07:14 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2016-06-29 16:17:06 +0000
@@ -49,7 +49,7 @@
 #include "gsd-input-helper.h"
 #include "gnome-settings-plugin.h"
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-xrandr-manager.h"
 #include "gsd-rr-config.h"
 #include "gsd-rr.h"
 
=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2016-02-09 09:56:17 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2016-06-29 16:17:06 +0000
@@ -434,6 +434,29 @@
         return dpi * factor;
 }
 
+static gboolean
+in_desktop (const gchar *name)
+{
+        const gchar *desktop_name_list;
+        gchar **names;
+        gboolean in_list = FALSE;
+        gint i;
+
+        desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
+        if (!desktop_name_list)
+                return FALSE;
+
+        names = g_strsplit (desktop_name_list, ":", -1);
+        for (i = 0; names[i] && !in_list; i++)
+                if (strcmp (names[i], name) == 0) {
+                        in_list = TRUE;
+                        break;
+                }
+        g_strfreev (names);
+
+        return in_list;
+}
+
 static int
 get_window_scale (GnomeXSettingsManager *manager)
 {
@@ -453,7 +476,7 @@
                 window_scale = 1;
 
                 /* Under Unity let the shell handle the scaling */
-                if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
+                if (in_desktop ("Unity"))
                         goto out;
 
                 display = gdk_display_get_default ();