3 files changed, 9 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 4d4df12..8e6862e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -501,16 +501,6 @@ else
 exit 1
 fi
 
-# We can't lock on MacOS X, so don't compile in support for it.
-#
-if test "$ac_macosx" = yes; then
- if test "$enable_locking" = yes; then
- AC_MSG_RESULT(locking disabled: it doesnt work on MacOS X)
- enable_locking=no
- AC_DEFINE(NO_LOCKING, 1, [Define if screen locking support is disabled])
- fi
-fi
-
 # Check whether to use a xscreensaver hacks configuration directory
 AC_MSG_CHECKING([whether to use xscreensaver hacks configuration])
 AC_ARG_WITH(xscreensaverdir, AC_HELP_STRING([--with-xscreensaverdir=dir], [Use xscreensaver hack configs found in directory],))
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 7f4acaa..f3dd09c 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -78,9 +78,9 @@ static DBusHandlerResult gs_listener_message_handler (DBusConnection *connec
 #define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
 #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
 
-#define SESSION_NAME "org.mate.SessionManager"
-#define SESSION_PATH "/org/mate/SessionManager"
-#define SESSION_INTERFACE "org.mate.SessionManager"
+#define SESSION_NAME "org.gnome.SessionManager"
+#define SESSION_PATH "/org/gnome/SessionManager"
+#define SESSION_INTERFACE "org.gnome.SessionManager"
 
 #define TYPE_MISMATCH_ERROR GS_LISTENER_INTERFACE ".TypeMismatch"
 
diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c
index 2871512..7b5b5c5 100644
--- a/src/gs-watcher-x11.c
+++ b/src/gs-watcher-x11.c
@@ -434,9 +434,9 @@ connect_presence_watcher (GSWatcher *watcher)
 
 error = NULL;
 watcher->priv->presence_proxy = dbus_g_proxy_new_for_name_owner (bus,
- "org.mate.SessionManager",
- "/org/mate/SessionManager/Presence",
- "org.mate.SessionManager.Presence",
+ "org.gnome.SessionManager",
+ "/org/gnome/SessionManager/Presence",
+ "org.gnome.SessionManager.Presence",
 &error);
 if (watcher->priv->presence_proxy != NULL)
 {
@@ -463,7 +463,7 @@ connect_presence_watcher (GSWatcher *watcher)
 
 proxy = dbus_g_proxy_new_from_proxy (watcher->priv->presence_proxy,
 "org.freedesktop.DBus.Properties",
- "/org/mate/SessionManager/Presence");
+ "/org/gnome/SessionManager/Presence");
 if (proxy != NULL)
 {
 guint status;
@@ -477,7 +477,7 @@ connect_presence_watcher (GSWatcher *watcher)
 dbus_g_proxy_call (proxy,
 "Get",
 &error,
- G_TYPE_STRING, "org.mate.SessionManager.Presence",
+ G_TYPE_STRING, "org.gnome.SessionManager.Presence",
 G_TYPE_STRING, "status",
 G_TYPE_INVALID,
 G_TYPE_VALUE, &value,
@@ -500,7 +500,7 @@ connect_presence_watcher (GSWatcher *watcher)
 dbus_g_proxy_call (proxy,
 "Get",
 &error,
- G_TYPE_STRING, "org.mate.SessionManager.Presence",
+ G_TYPE_STRING, "org.gnome.SessionManager.Presence",
 G_TYPE_STRING, "status-text",
 G_TYPE_INVALID,
 G_TYPE_VALUE, &value,