aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-23 12:07:46 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-23 12:07:46 +0200
commit16008bb3a547389a8870692a5af6729420b32120 (patch)
tree89b9e4a2e784d0a867e19d76825cc2e3fdd4c5ec
parent3db7888c6309a00148e26620814f8942993981a1 (diff)
downloadayatana-indicator-session-16008bb3a547389a8870692a5af6729420b32120.tar.gz
ayatana-indicator-session-16008bb3a547389a8870692a5af6729420b32120.tar.bz2
ayatana-indicator-session-16008bb3a547389a8870692a5af6729420b32120.zip
De-Canonical'ize: Rename DBus bus com.canonical.Unity to org.ayatana.Desktop.
-rw-r--r--src/backend-dbus/CMakeLists.txt2
-rw-r--r--src/backend-dbus/actions.c6
-rw-r--r--src/backend-dbus/org.ayatana.Desktop.Session.xml (renamed from src/backend-dbus/com.canonical.Unity.Session.xml)2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/backend-dbus/CMakeLists.txt b/src/backend-dbus/CMakeLists.txt
index a08851b..d0d3a35 100644
--- a/src/backend-dbus/CMakeLists.txt
+++ b/src/backend-dbus/CMakeLists.txt
@@ -45,7 +45,7 @@ add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-end-session-dialog
add_gdbus_codegen (BACKEND_GENERATED_SOURCES unity-session
com.canonical
- ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.Unity.Session.xml)
+ ${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.Desktop.Session.xml)
set (SOURCES actions.c guest.c users.c backend-dbus.c utils.c)
diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
index a958731..4fec536 100644
--- a/src/backend-dbus/actions.c
+++ b/src/backend-dbus/actions.c
@@ -1105,8 +1105,8 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self)
unity_session_proxy_new_for_bus (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
- "com.canonical.Unity",
- "/com/canonical/Unity/Session",
+ "org.ayatana.Desktop",
+ "/org/ayatana/Desktop/Session",
p->cancellable,
on_unity_proxy_ready,
self);
@@ -1129,7 +1129,7 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self)
end_session_dialog_proxy_new_for_bus (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
- "com.canonical.Unity",
+ "org.ayatana.Desktop",
"/org/gnome/SessionManager/EndSessionDialog",
p->cancellable,
on_end_session_dialog_proxy_ready,
diff --git a/src/backend-dbus/com.canonical.Unity.Session.xml b/src/backend-dbus/org.ayatana.Desktop.Session.xml
index 1dce43e..9257b91 100644
--- a/src/backend-dbus/com.canonical.Unity.Session.xml
+++ b/src/backend-dbus/org.ayatana.Desktop.Session.xml
@@ -2,7 +2,7 @@
"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="com.canonical.Unity.Session">
+ <interface name="org.ayatana.Desktop.Session">
<method name="Lock" />
<method name="PromptLock" />
<method name="RequestLogout" />