[gnome-settings-daemon] main: Use new defines for D-Bus names

[Bastien Nocera <hadess src gnome org>]

commit 070757a4ead3e4c3e3a4739f8a7e122d797e1ebb
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Dec 19 15:56:22 2012 +0100

    main: Use new defines for D-Bus names

 gnome-settings-daemon/gnome-settings-manager.c |   10 ++++------
 gnome-settings-daemon/main.c                   |    3 +--
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index be67c22..109ae4d 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -33,13 +33,11 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-pnp-ids.h>
 
+#include "gnome-settings-plugin.h"
 #include "gnome-settings-plugin-info.h"
 #include "gnome-settings-manager.h"
 #include "gnome-settings-profile.h"
 
-#define GSD_MANAGER_DBUS_PATH "/org/gnome/SettingsDaemon"
-#define GSD_MANAGER_DBUS_NAME "org.gnome.SettingsDaemon"
-
 #define DEFAULT_SETTINGS_PREFIX "org.gnome.settings-daemon"
 
 #define PLUGIN_EXT ".gnome-settings-plugin"
@@ -149,8 +147,8 @@ emit_signal (GnomeSettingsManager    *manager,
 
         if (g_dbus_connection_emit_signal (manager->priv->connection,
                                            NULL,
-                                           GSD_MANAGER_DBUS_PATH,
-                                           GSD_MANAGER_DBUS_NAME,
+                                           GSD_DBUS_PATH,
+                                           GSD_DBUS_NAME,
                                            "PluginActivated",
                                            g_variant_new ("(s)", name),
                                            &error) == FALSE) {
@@ -358,7 +356,7 @@ on_bus_gotten (GObject             *source_object,
         manager->priv->connection = connection;
 
         g_dbus_connection_register_object (connection,
-                                           GSD_MANAGER_DBUS_PATH,
+                                           GSD_DBUS_PATH,
                                            manager->priv->introspection_data->interfaces[0],
                                            NULL,
                                            NULL,
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index e834c3b..ddc08d6 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -34,11 +34,10 @@
 #include <libnotify/notify.h>
 
 #include "gnome-settings-manager.h"
+#include "gnome-settings-plugin.h"
 #include "gnome-settings-profile.h"
 #include "gnome-settings-session.h"
 
-#define GSD_DBUS_NAME         "org.gnome.SettingsDaemon"
-
 #define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
 #define GNOME_SESSION_CLIENT_PRIVATE_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"