summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/dbus/Makefile.am30
-rw-r--r--doc/dbus/mate-session.xml.in10
-rw-r--r--mate-session/Makefile.am32
-rw-r--r--mate-session/README2
-rw-r--r--mate-session/gsm-app.c2
-rw-r--r--mate-session/gsm-client.c2
-rw-r--r--mate-session/gsm-dbus-client.c4
-rw-r--r--mate-session/gsm-inhibitor.c2
-rw-r--r--mate-session/gsm-manager.c8
-rw-r--r--mate-session/gsm-presence.c2
-rw-r--r--mate-session/main.c25
-rw-r--r--mate-session/org.gnome.SessionManager.App.xml (renamed from mate-session/org.mate.SessionManager.App.xml)2
-rw-r--r--mate-session/org.gnome.SessionManager.Client.xml (renamed from mate-session/org.mate.SessionManager.Client.xml)2
-rw-r--r--mate-session/org.gnome.SessionManager.ClientPrivate.xml (renamed from mate-session/org.mate.SessionManager.ClientPrivate.xml)20
-rw-r--r--mate-session/org.gnome.SessionManager.Inhibitor.xml (renamed from mate-session/org.mate.SessionManager.Inhibitor.xml)2
-rw-r--r--mate-session/org.gnome.SessionManager.Presence.xml (renamed from mate-session/org.mate.SessionManager.Presence.xml)2
-rw-r--r--mate-session/org.gnome.SessionManager.xml (renamed from mate-session/org.mate.SessionManager.xml)22
-rw-r--r--mate-session/test-client-dbus.c8
-rw-r--r--mate-session/test-inhibit.c6
-rw-r--r--tools/mate-session-inhibit.c6
-rw-r--r--tools/mate-session-save.c6
21 files changed, 109 insertions, 86 deletions
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index 4ca511d..fa8cabd 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,10 +1,10 @@
SPEC_XML_FILES = \
mate-session.xml \
- org.mate.SessionManager.ref.xml \
- org.mate.SessionManager.Client.ref.xml \
- org.mate.SessionManager.ClientPrivate.ref.xml \
- org.mate.SessionManager.Inhibitor.ref.xml \
- org.mate.SessionManager.Presence.ref.xml
+ org.gnome.SessionManager.ref.xml \
+ org.gnome.SessionManager.Client.ref.xml \
+ org.gnome.SessionManager.ClientPrivate.ref.xml \
+ org.gnome.SessionManager.Inhibitor.ref.xml \
+ org.gnome.SessionManager.Presence.ref.xml
if DOCBOOK_DOCS_ENABLED
@@ -16,23 +16,23 @@ mate-session.html: $(SPEC_XML_FILES)
endif # DOCBOOK_DOCS_ENABLED
-org.mate.SessionManager.ref.xml: $(top_srcdir)/mate-session/org.mate.SessionManager.xml spec-to-docbook.xsl
+org.gnome.SessionManager.ref.xml: $(top_srcdir)/mate-session/org.gnome.SessionManager.xml spec-to-docbook.xsl
$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.mate.SessionManager.Client.ref.xml: $(top_srcdir)/mate-session/org.mate.SessionManager.Client.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Client.ref.xml: $(top_srcdir)/mate-session/org.gnome.SessionManager.Client.xml spec-to-docbook.xsl
$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.mate.SessionManager.ClientPrivate.ref.xml: $(top_srcdir)/mate-session/org.mate.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
+org.gnome.SessionManager.ClientPrivate.ref.xml: $(top_srcdir)/mate-session/org.gnome.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.mate.SessionManager.Inhibitor.ref.xml: $(top_srcdir)/mate-session/org.mate.SessionManager.Inhibitor.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Inhibitor.ref.xml: $(top_srcdir)/mate-session/org.gnome.SessionManager.Inhibitor.xml spec-to-docbook.xsl
$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.mate.SessionManager.Presence.ref.xml: $(top_srcdir)/mate-session/org.mate.SessionManager.Presence.xml spec-to-docbook.xsl
+org.gnome.SessionManager.Presence.ref.xml: $(top_srcdir)/mate-session/org.gnome.SessionManager.Presence.xml spec-to-docbook.xsl
$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
BUILT_SOURCES = \
- org.mate.SessionManager.ref.xml \
- org.mate.SessionManager.Client.ref.xml \
- org.mate.SessionManager.ClientPrivate.ref.xml \
- org.mate.SessionManager.Inhibitor.ref.xml \
- org.mate.SessionManager.Presence.ref.xml
+ org.gnome.SessionManager.ref.xml \
+ org.gnome.SessionManager.Client.ref.xml \
+ org.gnome.SessionManager.ClientPrivate.ref.xml \
+ org.gnome.SessionManager.Inhibitor.ref.xml \
+ org.gnome.SessionManager.Presence.ref.xml
CLEANFILES = \
$(BUILT_SOURCES) \
diff --git a/doc/dbus/mate-session.xml.in b/doc/dbus/mate-session.xml.in
index 12f0436..bd5eb45 100644
--- a/doc/dbus/mate-session.xml.in
+++ b/doc/dbus/mate-session.xml.in
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY dbus-Manager SYSTEM "org.mate.SessionManager.ref.xml">
-<!ENTITY dbus-Client SYSTEM "org.mate.SessionManager.Client.ref.xml">
-<!ENTITY dbus-ClientPrivate SYSTEM "org.mate.SessionManager.ClientPrivate.ref.xml">
-<!ENTITY dbus-Inhibitor SYSTEM "org.mate.SessionManager.Inhibitor.ref.xml">
-<!ENTITY dbus-Presence SYSTEM "org.mate.SessionManager.Presence.ref.xml">
+<!ENTITY dbus-Manager SYSTEM "org.gnome.SessionManager.ref.xml">
+<!ENTITY dbus-Client SYSTEM "org.gnome.SessionManager.Client.ref.xml">
+<!ENTITY dbus-ClientPrivate SYSTEM "org.gnome.SessionManager.ClientPrivate.ref.xml">
+<!ENTITY dbus-Inhibitor SYSTEM "org.gnome.SessionManager.Inhibitor.ref.xml">
+<!ENTITY dbus-Presence SYSTEM "org.gnome.SessionManager.Presence.ref.xml">
]>
<book id="index">
diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am
index bfbdb1d..c6e8d37 100644
--- a/mate-session/Makefile.am
+++ b/mate-session/Makefile.am
@@ -104,20 +104,20 @@ gsm-marshal.c: gsm-marshal.list
gsm-marshal.h: gsm-marshal.list
$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --header > $@
-gsm-manager-glue.h: org.mate.SessionManager.xml Makefile.am
- $(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.mate.SessionManager.xml
+gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
+ $(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
-gsm-client-glue.h: org.mate.SessionManager.Client.xml Makefile.am
- $(AM_V_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.mate.SessionManager.Client.xml
+gsm-client-glue.h: org.gnome.SessionManager.Client.xml Makefile.am
+ $(AM_V_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
-gsm-app-glue.h: org.mate.SessionManager.App.xml Makefile.am
- $(AM_V_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.mate.SessionManager.App.xml
+gsm-app-glue.h: org.gnome.SessionManager.App.xml Makefile.am
+ $(AM_V_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml
-gsm-inhibitor-glue.h: org.mate.SessionManager.Inhibitor.xml Makefile.am
- $(AM_V_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.mate.SessionManager.Inhibitor.xml
+gsm-inhibitor-glue.h: org.gnome.SessionManager.Inhibitor.xml Makefile.am
+ $(AM_V_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
-gsm-presence-glue.h: org.mate.SessionManager.Presence.xml Makefile.am
- $(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.mate.SessionManager.Presence.xml
+gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am
+ $(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
BUILT_SOURCES = \
gsm-marshal.c \
@@ -131,12 +131,12 @@ BUILT_SOURCES = \
EXTRA_DIST = \
README \
gsm-marshal.list \
- org.mate.SessionManager.xml \
- org.mate.SessionManager.App.xml \
- org.mate.SessionManager.Client.xml \
- org.mate.SessionManager.ClientPrivate.xml \
- org.mate.SessionManager.Inhibitor.xml \
- org.mate.SessionManager.Presence.xml
+ org.gnome.SessionManager.xml \
+ org.gnome.SessionManager.App.xml \
+ org.gnome.SessionManager.Client.xml \
+ org.gnome.SessionManager.ClientPrivate.xml \
+ org.gnome.SessionManager.Inhibitor.xml \
+ org.gnome.SessionManager.Presence.xml
CLEANFILES = \
$(BUILT_SOURCES)
diff --git a/mate-session/README b/mate-session/README
index 5b4e67b..f030efb 100644
--- a/mate-session/README
+++ b/mate-session/README
@@ -23,7 +23,7 @@ Startup is divided into 6 phases (GsmSessionPhase):
running very early (before any windows are displayed).
Apps in this phase can make use of a D-Bus interface
- (org.mate.SessionManager.Setenv) to set environment variables
+ (org.gnome.SessionManager.Setenv) to set environment variables
in mate-session's environment. This can be used for things like
$GTK_MODULES, $MATE_KEYRING_SOCKET, etc
diff --git a/mate-session/gsm-app.c b/mate-session/gsm-app.c
index 9b3ea39..55c2911 100644
--- a/mate-session/gsm-app.c
+++ b/mate-session/gsm-app.c
@@ -121,7 +121,7 @@ gsm_app_constructor (GType type,
construct_properties));
g_free (app->priv->id);
- app->priv->id = g_strdup_printf ("/org/mate/SessionManager/App%u", get_next_app_serial ());
+ app->priv->id = g_strdup_printf ("/org/gnome/SessionManager/App%u", get_next_app_serial ());
res = register_app (app);
if (! res) {
diff --git a/mate-session/gsm-client.c b/mate-session/gsm-client.c
index 801e05c..2909d99 100644
--- a/mate-session/gsm-client.c
+++ b/mate-session/gsm-client.c
@@ -140,7 +140,7 @@ gsm_client_constructor (GType type,
construct_properties));
g_free (client->priv->id);
- client->priv->id = g_strdup_printf ("/org/mate/SessionManager/Client%u", get_next_client_serial ());
+ client->priv->id = g_strdup_printf ("/org/gnome/SessionManager/Client%u", get_next_client_serial ());
res = register_client (client);
if (! res) {
diff --git a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
index b156fd1..3b33170 100644
--- a/mate-session/gsm-dbus-client.c
+++ b/mate-session/gsm-dbus-client.c
@@ -40,8 +40,8 @@
#define GSM_DBUS_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_DBUS_CLIENT, GsmDBusClientPrivate))
-#define SM_DBUS_NAME "org.mate.SessionManager"
-#define SM_DBUS_CLIENT_PRIVATE_INTERFACE "org.mate.SessionManager.ClientPrivate"
+#define SM_DBUS_NAME "org.gnome.SessionManager"
+#define SM_DBUS_CLIENT_PRIVATE_INTERFACE "org.gnome.SessionManager.ClientPrivate"
struct GsmDBusClientPrivate
{
diff --git a/mate-session/gsm-inhibitor.c b/mate-session/gsm-inhibitor.c
index 33de12f..6f4e229 100644
--- a/mate-session/gsm-inhibitor.c
+++ b/mate-session/gsm-inhibitor.c
@@ -142,7 +142,7 @@ gsm_inhibitor_constructor (GType type,
construct_properties));
g_free (inhibitor->priv->id);
- inhibitor->priv->id = g_strdup_printf ("/org/mate/SessionManager/Inhibitor%u", get_next_inhibitor_serial ());
+ inhibitor->priv->id = g_strdup_printf ("/org/gnome/SessionManager/Inhibitor%u", get_next_inhibitor_serial ());
res = register_inhibitor (inhibitor);
if (! res) {
g_warning ("Unable to register inhibitor with session bus");
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index 552307c..c3c7c12 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -69,8 +69,8 @@
#define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate))
-#define GSM_MANAGER_DBUS_PATH "/org/mate/SessionManager"
-#define GSM_MANAGER_DBUS_NAME "org.mate.SessionManager"
+#define GSM_MANAGER_DBUS_PATH "/org/gnome/SessionManager"
+#define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
#define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
@@ -3275,8 +3275,8 @@ user_logout (GsmManager *manager,
/*
dbus-send --session --type=method_call --print-reply
- --dest=org.mate.SessionManager
- /org/mate/SessionManager
+ --dest=org.gnome.SessionManager
+ /org/gnome/SessionManager
org.freedesktop.DBus.Introspectable.Introspect
*/
diff --git a/mate-session/gsm-presence.c b/mate-session/gsm-presence.c
index 725e4f3..4e21140 100644
--- a/mate-session/gsm-presence.c
+++ b/mate-session/gsm-presence.c
@@ -33,7 +33,7 @@
#include "gsm-presence.h"
#include "gsm-presence-glue.h"
-#define GSM_PRESENCE_DBUS_PATH "/org/mate/SessionManager/Presence"
+#define GSM_PRESENCE_DBUS_PATH "/org/gnome/SessionManager/Presence"
#define GS_NAME "org.mate.ScreenSaver"
#define GS_PATH "/org/mate/ScreenSaver"
diff --git a/mate-session/main.c b/mate-session/main.c
index bb46c81..5f6e221 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -74,7 +74,10 @@
#define MOBILITY_KEY "exec"
#define MOBILITY_STARTUP_KEY "startup"
-#define GSM_DBUS_NAME "org.mate.SessionManager"
+#define MATE_INTERFACE_SCHEMA "org.mate.interface"
+#define GTK_OVERLAY_SCROLL "gtk-overlay-scrolling"
+
+#define GSM_DBUS_NAME "org.gnome.SessionManager"
#define KEY_AUTOSAVE "auto-save-session"
@@ -534,6 +537,23 @@ void debug_changed (GSettings *settings, gchar *key, gpointer user_data)
mdm_log_set_debug (debug);
}
+static void set_overlay_scroll (void)
+{
+ GSettings *settings;
+ gboolean enabled;
+
+ settings = g_settings_new (MATE_INTERFACE_SCHEMA);
+ enabled = g_settings_get_boolean (settings, GTK_OVERLAY_SCROLL);
+
+ if (enabled) {
+ gsm_util_setenv ("GTK_OVERLAY_SCROLLING", "1");
+ } else {
+ gsm_util_setenv ("GTK_OVERLAY_SCROLLING", "0");
+ }
+
+ g_object_unref (settings);
+}
+
int main(int argc, char** argv)
{
struct sigaction sa;
@@ -638,6 +658,9 @@ int main(int argc, char** argv)
/* Starts gnome compat mode */
msm_gnome_start();
+ /* Set to use Gtk3 overlay scroll */
+ set_overlay_scroll ();
+
manager = gsm_manager_new(client_store, failsafe);
signal_handler = mdm_signal_handler_new();
diff --git a/mate-session/org.mate.SessionManager.App.xml b/mate-session/org.gnome.SessionManager.App.xml
index 971eb7e..9f6e1b3 100644
--- a/mate-session/org.mate.SessionManager.App.xml
+++ b/mate-session/org.gnome.SessionManager.App.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.mate.SessionManager.App">
+ <interface name="org.gnome.SessionManager.App">
<method name="GetAppId">
<arg type="s" name="app_id" direction="out">
<doc:doc>
diff --git a/mate-session/org.mate.SessionManager.Client.xml b/mate-session/org.gnome.SessionManager.Client.xml
index 0d51986..a0f5a31 100644
--- a/mate-session/org.mate.SessionManager.Client.xml
+++ b/mate-session/org.gnome.SessionManager.Client.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.mate.SessionManager.Client">
+ <interface name="org.gnome.SessionManager.Client">
<method name="GetAppId">
<arg type="s" name="app_id" direction="out">
<doc:doc>
diff --git a/mate-session/org.mate.SessionManager.ClientPrivate.xml b/mate-session/org.gnome.SessionManager.ClientPrivate.xml
index 6adedba..a167065 100644
--- a/mate-session/org.mate.SessionManager.ClientPrivate.xml
+++ b/mate-session/org.gnome.SessionManager.ClientPrivate.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.mate.SessionManager.ClientPrivate">
+ <interface name="org.gnome.SessionManager.ClientPrivate">
<method name="EndSessionResponse">
<arg name="is_ok" type="b" direction="in">
<doc:doc>
@@ -16,8 +16,8 @@
<doc:doc>
<doc:description>
<doc:para>This method should be used by the client in response to
- the <doc:ref type="signal" to="org.mate.SessionManager.ClientPrivate::QueryEndSession">QueryEndSession</doc:ref>
- and <doc:ref type="signal" to="org.mate.SessionManager.ClientPrivate::EndSession">EndSession</doc:ref> signals.
+ the <doc:ref type="signal" to="org.gnome.SessionManager.ClientPrivate::QueryEndSession">QueryEndSession</doc:ref>
+ and <doc:ref type="signal" to="org.gnome.SessionManager.ClientPrivate::EndSession">EndSession</doc:ref> signals.
</doc:para>
</doc:description>
</doc:doc>
@@ -46,7 +46,7 @@
<doc:para>This signal is used to inform the client that the
session is about to end. The client must respond by
calling
- <doc:ref type="method" to="org.mate.SessionManager.ClientPrivate.EndSessionResponse">EndSessionResponse</doc:ref>
+ <doc:ref type="method" to="org.gnome.SessionManager.ClientPrivate.EndSessionResponse">EndSessionResponse</doc:ref>
within one second of the signal emission.
</doc:para>
<doc:para>
@@ -55,7 +55,7 @@
<doc:item>
<doc:term>1</doc:term>
<doc:definition>Logout is forced.
- <doc:ref type="method" to="org.mate.SessionManager.ClientPrivate.EndSessionResponse">EndSessionResponse</doc:ref>
+ <doc:ref type="method" to="org.gnome.SessionManager.ClientPrivate.EndSessionResponse">EndSessionResponse</doc:ref>
reason and any inhibit from client will be
ignored.</doc:definition>
</doc:item>
@@ -71,12 +71,12 @@
interact with the user in response to this signal. Any
actions required for a clean shutdown should take place in
response to the
- <doc:ref type="signal" to="org.mate.SessionManager.ClientPrivate::EndSession">EndSession</doc:ref> signal.
+ <doc:ref type="signal" to="org.gnome.SessionManager.ClientPrivate::EndSession">EndSession</doc:ref> signal.
</doc:para>
<doc:para>
The client should limit operations until either a
- <doc:ref type="signal" to="org.mate.SessionManager.ClientPrivate::EndSession">EndSession</doc:ref>
- <doc:ref type="signal" to="org.mate.SessionManager.ClientPrivate::CancelEndSession">CancelEndSession</doc:ref>
+ <doc:ref type="signal" to="org.gnome.SessionManager.ClientPrivate::EndSession">EndSession</doc:ref>
+ <doc:ref type="signal" to="org.gnome.SessionManager.ClientPrivate::CancelEndSession">CancelEndSession</doc:ref>
signal is received.
</doc:para>
</doc:description>
@@ -94,7 +94,7 @@
<doc:para>This signal is used to inform the client that the
session is about to end. The client must respond by
calling
- <doc:ref type="method" to="org.mate.SessionManager.ClientPrivate.EndSessionResponse">EndSessionResponse</doc:ref>
+ <doc:ref type="method" to="org.gnome.SessionManager.ClientPrivate.EndSessionResponse">EndSessionResponse</doc:ref>
within ten seconds of the signal emission.
</doc:para>
<doc:para>
@@ -112,7 +112,7 @@
<doc:description>
<doc:para>
This signal indicates to the client that a previous emission of
- <doc:ref type="signal" to="org.mate.SessionManager.ClientPrivate::QueryEndSession">QueryEndSession</doc:ref>
+ <doc:ref type="signal" to="org.gnome.SessionManager.ClientPrivate::QueryEndSession">QueryEndSession</doc:ref>
has been cancelled. The client should resume normal operations.
</doc:para>
</doc:description>
diff --git a/mate-session/org.mate.SessionManager.Inhibitor.xml b/mate-session/org.gnome.SessionManager.Inhibitor.xml
index 4d1f128..342d2a8 100644
--- a/mate-session/org.mate.SessionManager.Inhibitor.xml
+++ b/mate-session/org.gnome.SessionManager.Inhibitor.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.mate.SessionManager.Inhibitor">
+ <interface name="org.gnome.SessionManager.Inhibitor">
<method name="GetAppId">
<arg type="s" name="app_id" direction="out">
<doc:doc>
diff --git a/mate-session/org.mate.SessionManager.Presence.xml b/mate-session/org.gnome.SessionManager.Presence.xml
index 49f0620..0441970 100644
--- a/mate-session/org.mate.SessionManager.Presence.xml
+++ b/mate-session/org.gnome.SessionManager.Presence.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.mate.SessionManager.Presence">
+ <interface name="org.gnome.SessionManager.Presence">
<property name="status" type="u" access="readwrite">
<doc:doc>
diff --git a/mate-session/org.mate.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml
index 9b6f452..190f372 100644
--- a/mate-session/org.mate.SessionManager.xml
+++ b/mate-session/org.gnome.SessionManager.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.mate.SessionManager">
+ <interface name="org.gnome.SessionManager">
<!-- Initialization phase interfaces -->
@@ -116,7 +116,7 @@
<doc:para>Applications should invoke this method when they begin an operation that
should not be interrupted, such as creating a CD or DVD. The types of actions
that may be blocked are specified by the flags parameter. When the application
- completes the operation it should call <doc:ref type="method" to="org.mate.SessionManager.Uninhibit">Uninhibit()</doc:ref>
+ completes the operation it should call <doc:ref type="method" to="org.gnome.SessionManager.Uninhibit">Uninhibit()</doc:ref>
or disconnect from the session bus.
</doc:para>
<doc:para>
@@ -151,7 +151,7 @@
</doc:para>
<doc:para>
The returned cookie is used to uniquely identify this request. It should be used
- as an argument to <doc:ref type="method" to="org.mate.SessionManager.Uninhibit">Uninhibit()</doc:ref> in
+ as an argument to <doc:ref type="method" to="org.gnome.SessionManager.Uninhibit">Uninhibit()</doc:ref> in
order to remove the request.
</doc:para>
</doc:description>
@@ -167,7 +167,7 @@
</arg>
<doc:doc>
<doc:description>
- <doc:para>Cancel a previous call to <doc:ref type="method" to="org.mate.SessionManager.Inhibit">Inhibit()</doc:ref> identified by the cookie.</doc:para>
+ <doc:para>Cancel a previous call to <doc:ref type="method" to="org.gnome.SessionManager.Inhibit">Inhibit()</doc:ref> identified by the cookie.</doc:para>
</doc:description>
</doc:doc>
</method>
@@ -188,7 +188,7 @@
<doc:para>Determine if operation(s) specified by the flags
are currently inhibited. Flags are same as those accepted
by the
- <doc:ref type="method" to="org.mate.SessionManager.Inhibit">Inhibit()</doc:ref>
+ <doc:ref type="method" to="org.gnome.SessionManager.Inhibit">Inhibit()</doc:ref>
method.</doc:para>
</doc:description>
</doc:doc>
@@ -202,12 +202,12 @@
</arg>
<doc:doc>
<doc:description>
- <doc:para>This gets a list of all the <doc:ref type="interface" to="org.mate.SessionManager.Client">Clients</doc:ref>
+ <doc:para>This gets a list of all the <doc:ref type="interface" to="org.gnome.SessionManager.Client">Clients</doc:ref>
that are currently known to the session manager.</doc:para>
<doc:para>Each Client ID is an D-Bus object path for the object that implements the
- <doc:ref type="interface" to="org.mate.SessionManager.Client">Client</doc:ref> interface.</doc:para>
+ <doc:ref type="interface" to="org.gnome.SessionManager.Client">Client</doc:ref> interface.</doc:para>
</doc:description>
- <doc:seealso><doc:ref type="interface" to="org.mate.SessionManager.Client">org.mate.SessionManager.Client</doc:ref></doc:seealso>
+ <doc:seealso><doc:ref type="interface" to="org.gnome.SessionManager.Client">org.gnome.SessionManager.Client</doc:ref></doc:seealso>
</doc:doc>
</method>
@@ -219,12 +219,12 @@
</arg>
<doc:doc>
<doc:description>
- <doc:para>This gets a list of all the <doc:ref type="interface" to="org.mate.SessionManager.Inhibitor">Inhibitors</doc:ref>
+ <doc:para>This gets a list of all the <doc:ref type="interface" to="org.gnome.SessionManager.Inhibitor">Inhibitors</doc:ref>
that are currently known to the session manager.</doc:para>
<doc:para>Each Inhibitor ID is an D-Bus object path for the object that implements the
- <doc:ref type="interface" to="org.mate.SessionManager.Inhibitor">Inhibitor</doc:ref> interface.</doc:para>
+ <doc:ref type="interface" to="org.gnome.SessionManager.Inhibitor">Inhibitor</doc:ref> interface.</doc:para>
</doc:description>
- <doc:seealso><doc:ref type="interface" to="org.mate.SessionManager.Inhibitor">org.mate.SessionManager.Inhibitor</doc:ref></doc:seealso>
+ <doc:seealso><doc:ref type="interface" to="org.gnome.SessionManager.Inhibitor">org.gnome.SessionManager.Inhibitor</doc:ref></doc:seealso>
</doc:doc>
</method>
diff --git a/mate-session/test-client-dbus.c b/mate-session/test-client-dbus.c
index a41255a..70f7d3a 100644
--- a/mate-session/test-client-dbus.c
+++ b/mate-session/test-client-dbus.c
@@ -29,11 +29,11 @@
#include <glib.h>
#include <dbus/dbus-glib.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 SM_CLIENT_DBUS_INTERFACE "org.mate.SessionManager.ClientPrivate"
+#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"
#ifdef __GNUC__
#define UNUSED_VARIABLE __attribute__ ((unused))
diff --git a/mate-session/test-inhibit.c b/mate-session/test-inhibit.c
index 3e05750..fdc0744 100644
--- a/mate-session/test-inhibit.c
+++ b/mate-session/test-inhibit.c
@@ -30,9 +30,9 @@
#include <gdk/gdkx.h>
#include <dbus/dbus-glib.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"
#ifdef __GNUC__
#define UNUSED_VARIABLE __attribute__ ((unused))
diff --git a/tools/mate-session-inhibit.c b/tools/mate-session-inhibit.c
index f66598b..6473735 100644
--- a/tools/mate-session-inhibit.c
+++ b/tools/mate-session-inhibit.c
@@ -86,9 +86,9 @@ static gboolean inhibit (const gchar *app_id,
}
ret = g_dbus_connection_call_sync (bus,
- "org.mate.SessionManager",
- "/org/mate/SessionManager",
- "org.mate.SessionManager",
+ "org.gnome.SessionManager",
+ "/org/gnome/SessionManager",
+ "org.gnome.SessionManager",
"Inhibit",
g_variant_new ("(susu)",
app_id, 0, reason, flags),
diff --git a/tools/mate-session-save.c b/tools/mate-session-save.c
index d80f461..b64ae90 100644
--- a/tools/mate-session-save.c
+++ b/tools/mate-session-save.c
@@ -33,9 +33,9 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#define GSM_SERVICE_DBUS "org.mate.SessionManager"
-#define GSM_PATH_DBUS "/org/mate/SessionManager"
-#define GSM_INTERFACE_DBUS "org.mate.SessionManager"
+#define GSM_SERVICE_DBUS "org.gnome.SessionManager"
+#define GSM_PATH_DBUS "/org/gnome/SessionManager"
+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
enum {
GSM_LOGOUT_MODE_NORMAL = 0,