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

4 files changed, 10 insertions, 11 deletions

diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index c0d749e3..5c3c3ec7 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
index 0d883a5d..10ebaae0 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
index 857479fd..666b4938 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 56cd5e88..0037a3f2 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);