summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Lefebvre <[email protected]>2015-09-04 21:48:05 +0100
committerClement Lefebvre <[email protected]>2015-09-04 21:48:05 +0100
commit2db7cc811d771c2f2dd5ee9b0cbb6be1f6401170 (patch)
tree5951696a7ded27a92586ebff5cd311669056ebc6
parentedda5db43f885779f7f68aa6743852490e625c7e (diff)
downloadmate-settings-daemon-2db7cc811d771c2f2dd5ee9b0cbb6be1f6401170.tar.bz2
mate-settings-daemon-2db7cc811d771c2f2dd5ee9b0cbb6be1f6401170.tar.xz
Switch to org.gnome.SessionManager
-rw-r--r--mate-settings-daemon/main.c8
-rw-r--r--plugins/a11y-keyboard/msd-a11y-preferences-dialog.c6
-rw-r--r--plugins/background/msd-background-manager.c4
-rw-r--r--plugins/smartcard/msd-smartcard-plugin.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c
index 0e7a4c6..e1ae531 100644
--- a/mate-settings-daemon/main.c
+++ b/mate-settings-daemon/main.c
@@ -49,10 +49,10 @@
#define DEBUG_KEY "mate-settings-daemon"
#define DEBUG_SCHEMA "org.mate.debug"
-#define MATE_SESSION_DBUS_NAME "org.mate.SessionManager"
-#define MATE_SESSION_DBUS_OBJECT "/org/mate/SessionManager"
-#define MATE_SESSION_DBUS_INTERFACE "org.mate.SessionManager"
-#define MATE_SESSION_PRIVATE_DBUS_INTERFACE "org.mate.SessionManager.ClientPrivate"
+#define MATE_SESSION_DBUS_NAME "org.gnome.SessionManager"
+#define MATE_SESSION_DBUS_OBJECT "/org/gnome/SessionManager"
+#define MATE_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
+#define MATE_SESSION_PRIVATE_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"
/* this is kept only for compatibility with custom .desktop files */
static gboolean no_daemon = TRUE;
diff --git a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
index 368638b..fbb0af0 100644
--- a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
@@ -36,9 +36,9 @@
#include "msd-a11y-preferences-dialog.h"
-#define SM_DBUS_NAME "org.mate.SessionManager"
-#define SM_DBUS_PATH "/org/mate/SessionManager"
-#define SM_DBUS_INTERFACE "org.mate.SessionManager"
+#define SM_DBUS_NAME "org.gnome.SessionManager"
+#define SM_DBUS_PATH "/org/gnome/SessionManager"
+#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
#define MSD_A11Y_PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_A11Y_PREFERENCES_DIALOG, MsdA11yPreferencesDialogPrivate))
diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c
index 5b6a04b..bafefa8 100644
--- a/plugins/background/msd-background-manager.c
+++ b/plugins/background/msd-background-manager.c
@@ -54,8 +54,8 @@
#define mate_bg_set_surface_as_root_with_crossfade mate_bg_set_pixmap_as_root_with_crossfade
#endif
-#define MATE_SESSION_MANAGER_DBUS_NAME "org.mate.SessionManager"
-#define MATE_SESSION_MANAGER_DBUS_PATH "/org/mate/SessionManager"
+#define MATE_SESSION_MANAGER_DBUS_NAME "org.gnome.SessionManager"
+#define MATE_SESSION_MANAGER_DBUS_PATH "/org/gnome/SessionManager"
#define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate))
diff --git a/plugins/smartcard/msd-smartcard-plugin.c b/plugins/smartcard/msd-smartcard-plugin.c
index ae1b264..f4eb129 100644
--- a/plugins/smartcard/msd-smartcard-plugin.c
+++ b/plugins/smartcard/msd-smartcard-plugin.c
@@ -52,9 +52,9 @@ typedef enum
#define SCREENSAVER_DBUS_PATH "/"
#define SCREENSAVER_DBUS_INTERFACE "org.mate.ScreenSaver"
-#define SM_DBUS_NAME "org.mate.SessionManager"
-#define SM_DBUS_PATH "/org/mate/SessionManager"
-#define SM_DBUS_INTERFACE "org.mate.SessionManager"
+#define SM_DBUS_NAME "org.gnome.SessionManager"
+#define SM_DBUS_PATH "/org/gnome/SessionManager"
+#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
#define SM_LOGOUT_MODE_FORCE 2
#define MSD_SMARTCARD_SCHEMA "org.mate.peripherals-smartcard"