GNOME.org
 

[gnome-settings-daemon] common: rename gnome-settings-session to gnome-settings-bus

commit 2cabb3aedcd0aa740742219e962d5c3debba3643
Author: Ray Strode <rstrode redhat com>
Date:   Fri Aug 2 16:13:59 2013 -0400

    common: rename gnome-settings-session to gnome-settings-bus
    
    The gnome-settings-session code is so named because it used to
    exclusively house login session specific code (ConsoleKit/logind/gnome-session).
    
    Since then it's been used more generally as a place to stuff singleton
    dbus proxies used across multiple plugins.
    
    This commit renames it to gnome-settings-bus to give it a more
    appropriate name for its current role.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705127

 gnome-settings-daemon/Makefile.am                  |    4 ++--
 ...ome-settings-session.c => gnome-settings-bus.c} |    4 ++--
 ...ome-settings-session.h => gnome-settings-bus.h} |    9 ++++-----
 gnome-settings-daemon/main.c                       |    4 ++--
 plugins/color/gsd-color-x11.c                      |    4 ++--
 plugins/keyboard/gsd-keyboard-manager.c            |    2 +-
 plugins/media-keys/gsd-media-keys-manager.c        |    4 ++--
 plugins/power/gsd-power-manager.c                  |   14 +++++++-------
 .../remote-display/gsd-remote-display-manager.c    |    2 +-
 .../gsd-screensaver-proxy-manager.c                |    4 ++--
 plugins/smartcard/gsd-smartcard-manager.c          |    4 ++--
 plugins/updates/gsd-updates-manager.c              |    4 ++--
 plugins/updates/gsd-updates-refresh.c              |    4 ++--
 plugins/xrandr/gsd-xrandr-manager.c                |    2 +-
 14 files changed, 32 insertions(+), 33 deletions(-)
---
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index c0d749e..5c3c3ec 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -35,8 +35,8 @@ libgsd_la_SOURCES =           \
        $(session_manager_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 =           \
diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-bus.c
similarity index 96%
rename from gnome-settings-daemon/gnome-settings-session.c
rename to gnome-settings-daemon/gnome-settings-bus.c
index 0d883a5..10ebaae 100644
--- a/gnome-settings-daemon/gnome-settings-session.c
+++ b/gnome-settings-daemon/gnome-settings-bus.c
@@ -27,13 +27,13 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 
 #define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
 #define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
 
 GsdSessionManager *
-gnome_settings_session_get_session_proxy (void)
+gnome_settings_bus_get_session_proxy (void)
 {
         static GsdSessionManager *session_proxy;
         GError *error =  NULL;
diff --git a/gnome-settings-daemon/gnome-settings-session.h b/gnome-settings-daemon/gnome-settings-bus.h
similarity index 84%
rename from gnome-settings-daemon/gnome-settings-session.h
rename to gnome-settings-daemon/gnome-settings-bus.h
index 857479f..666b493 100644
--- a/gnome-settings-daemon/gnome-settings-session.h
+++ b/gnome-settings-daemon/gnome-settings-bus.h
@@ -19,17 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GNOME_SETTINGS_SESSION_H
-#define __GNOME_SETTINGS_SESSION_H
+#ifndef __GNOME_SETTINGS_BUS_H
+#define __GNOME_SETTINGS_BUS_H
 
 #include <glib-object.h>
 #include "gsd-session-manager-glue.h"
 
 G_BEGIN_DECLS
 
-GsdSessionManager        *gnome_settings_session_get_session_proxy  (void);
+GsdSessionManager        *gnome_settings_bus_get_session_proxy  (void);
 
 G_END_DECLS
 
-#endif /* __GNOME_SETTINGS_SESSION_H */
-
+#endif /* __GNOME_SETTINGS_BUS_H */
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 56cd5e8..0037a3f 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -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"
 
 #define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
 #define GNOME_SESSION_CLIENT_PRIVATE_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"
@@ -341,7 +341,7 @@ name_acquired_handler (GDBusConnection *connection,
 {
         GDBusProxy *proxy;
 
-        proxy = G_DBUS_PROXY (gnome_settings_session_get_session_proxy ());
+        proxy = G_DBUS_PROXY (gnome_settings_bus_get_session_proxy ());
         /* Always call this first, as Setenv can only be called before
            any client registers */
         set_locale (proxy);
diff --git a/plugins/color/gsd-color-x11.c b/plugins/color/gsd-color-x11.c
index 08b3e29..4e9cc54 100644
--- a/plugins/color/gsd-color-x11.c
+++ b/plugins/color/gsd-color-x11.c
@@ -31,7 +31,7 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-rr.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gnome-settings-plugin.h"
 
 #include "gsd-color-manager.h"
@@ -1386,7 +1386,7 @@ gsd_color_x11_init (GsdColorX11 *x11)
         priv = x11->priv = GSD_COLOR_X11_GET_PRIVATE (x11);
 
         /* track the active session */
-        priv->session = gnome_settings_session_get_session_proxy ();
+        priv->session = gnome_settings_bus_get_session_proxy ();
 
         /* set the _ICC_PROFILE atoms on the root screen */
         priv->gdk_window = gdk_screen_get_root_window (gdk_screen_get_default ());
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 54c9aa6..10c2a66 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -50,7 +50,7 @@
 #include <ibus.h>
 #endif
 
-#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"
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index d288f33..ae1baab 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -46,7 +46,7 @@
 
 #include "mpris-controller.h"
 #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"
@@ -845,7 +845,7 @@ gnome_session_shutdown (GsdMediaKeysManager *manager)
        GVariant *variant;
         GDBusProxy *proxy;
 
-        proxy = G_DBUS_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,
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 5d1fe38..297fe8d 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -46,7 +46,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"
 
@@ -145,7 +145,7 @@ struct GsdPowerManagerPrivate
 
         /* Settings */
         GSettings               *settings;
-        GSettings               *settings_session;
+        GSettings               *settings_bus;
         GSettings               *settings_screensaver;
         GSettings               *settings_xrandr;
 
@@ -2649,7 +2649,7 @@ idle_configure (GsdPowerManager *manager)
                 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;
@@ -3349,7 +3349,7 @@ gsd_power_manager_start (GsdPowerManager *manager,
         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);
@@ -3361,8 +3361,8 @@ gsd_power_manager_start (GsdPowerManager *manager,
         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);
         g_signal_connect (manager->priv->up_client, "device-added",
@@ -3504,7 +3504,7 @@ gsd_power_manager_stop (GsdPowerManager *manager)
         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) {
diff --git a/plugins/remote-display/gsd-remote-display-manager.c 
b/plugins/remote-display/gsd-remote-display-manager.c
index 031c5d1..c4e1c03 100644
--- a/plugins/remote-display/gsd-remote-display-manager.c
+++ b/plugins/remote-display/gsd-remote-display-manager.c
@@ -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"
 
diff --git a/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c 
b/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c
index 3532cb4..5005c1f 100644
--- a/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c
+++ b/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c
@@ -33,7 +33,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gnome-settings-profile.h"
 #include "gsd-screensaver-proxy-manager.h"
 
@@ -300,7 +300,7 @@ gsd_screensaver_proxy_manager_start (GsdScreensaverProxyManager *manager,
         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->watch_ht = g_hash_table_new_full (g_str_hash,
                                                          g_str_equal,
                                                          (GDestroyNotify) g_free,
diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c
index f5d68c0..e8c3b75 100644
--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -26,7 +26,7 @@
 
 #include "gnome-settings-plugin.h"
 #include "gnome-settings-profile.h"
-#include "gnome-settings-session.h"
+#include "gnome-settings-bus.h"
 #include "gsd-smartcard-manager.h"
 #include "gsd-smartcard-service.h"
 #include "gsd-smartcard-enum-types.h"
@@ -816,7 +816,7 @@ log_out (GsdSmartcardManager *self)
         GsdSmartcardManagerPrivate *priv = self->priv;
 
         if (priv->session_manager == NULL)
-                priv->session_manager = gnome_settings_session_get_session_proxy ();
+                priv->session_manager = gnome_settings_bus_get_session_proxy ();
 
         gsd_session_manager_call_logout (priv->session_manager,
                                          GSD_SESSION_MANAGER_LOGOUT_MODE_FORCE,
diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
index 3233223..a230e50 100644
--- a/plugins/updates/gsd-updates-manager.c
+++ b/plugins/updates/gsd-updates-manager.c
@@ -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))
 
@@ -1335,7 +1335,7 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
 
         /* 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;
 
diff --git a/plugins/updates/gsd-updates-refresh.c b/plugins/updates/gsd-updates-refresh.c
index 665543b..7769d54 100644
--- a/plugins/updates/gsd-updates-refresh.c
+++ b/plugins/updates/gsd-updates-refresh.c
@@ -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"
@@ -506,7 +506,7 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh)
 
         /* 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 (G_DBUS_PROXY (refresh->priv->proxy_session),
                                   "g-signal",
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index f2ac34d..8155ed0 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -55,7 +55,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"
 
 #define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, 
GsdXrandrManagerPrivate))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]