From 16008bb3a547389a8870692a5af6729420b32120 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 23 May 2017 12:07:46 +0200
Subject: De-Canonical'ize: Rename DBus bus com.canonical.Unity to
 org.ayatana.Desktop.

---
 src/backend-dbus/CMakeLists.txt                  |  2 +-
 src/backend-dbus/actions.c                       |  6 +++---
 src/backend-dbus/com.canonical.Unity.Session.xml | 12 ------------
 src/backend-dbus/org.ayatana.Desktop.Session.xml | 12 ++++++++++++
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/backend-dbus/com.canonical.Unity.Session.xml
 create mode 100644 src/backend-dbus/org.ayatana.Desktop.Session.xml

(limited to 'src/backend-dbus')

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/com.canonical.Unity.Session.xml
deleted file mode 100644
index 1dce43e..0000000
--- a/src/backend-dbus/com.canonical.Unity.Session.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE node PUBLIC
-"-//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">
-    <method name="Lock" />
-    <method name="PromptLock" />
-    <method name="RequestLogout" />
-    <method name="RequestReboot" />
-    <method name="RequestShutdown" />
-  </interface>
-</node>
diff --git a/src/backend-dbus/org.ayatana.Desktop.Session.xml b/src/backend-dbus/org.ayatana.Desktop.Session.xml
new file mode 100644
index 0000000..9257b91
--- /dev/null
+++ b/src/backend-dbus/org.ayatana.Desktop.Session.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE node PUBLIC
+"-//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="org.ayatana.Desktop.Session">
+    <method name="Lock" />
+    <method name="PromptLock" />
+    <method name="RequestLogout" />
+    <method name="RequestReboot" />
+    <method name="RequestShutdown" />
+  </interface>
+</node>
-- 
cgit v1.2.3