From 1c961a73b5d2e70f49174e30d66bbcfaed8c7f61 Mon Sep 17 00:00:00 2001
From: Derek Dai <daiderek@gmail.com>
Date: Tue, 13 Dec 2016 16:41:35 +0800
Subject: [PATCH] miracle-sender: change bus name from
 org.freedesktop.miracle.Sender to org.freedesktop.miracle

---
 res/CMakeLists.txt                        | 6 +++---
 res/org.freedesktop.miracle.service.cmake | 2 +-
 src/ctl/srcctl.c                          | 2 +-
 src/stream/CMakeLists.txt                 | 2 +-
 src/stream/sender.c                       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 9d54f0d..da44f53 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -8,12 +8,12 @@ execute_process(
 )
 
 configure_file(
-    org.freedesktop.miracle.Sender.service.cmake
-    org.freedesktop.miracle.Sender.service
+    org.freedesktop.miracle.service.cmake
+    org.freedesktop.miracle.service
     )
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.Sender.service
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.service
     DESTINATION ${DBUS_SESSION_SERVICES_DIR}/
     )
 
diff --git a/res/org.freedesktop.miracle.service.cmake b/res/org.freedesktop.miracle.service.cmake
index 99f29ae..fbd23f0 100644
--- a/res/org.freedesktop.miracle.service.cmake
+++ b/res/org.freedesktop.miracle.service.cmake
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.miracle.Sender
+Name=org.freedesktop.miracle
 Exec=@CMAKE_INSTALL_PREFIX@/bin/miracle-sender
diff --git a/src/ctl/srcctl.c b/src/ctl/srcctl.c
index 1d6b0d1..3d8fd93 100644
--- a/src/ctl/srcctl.c
+++ b/src/ctl/srcctl.c
@@ -597,7 +597,7 @@ void ctl_fn_src_setup(struct ctl_src *s)
 	if(!sender) {
 		sender = sender_proxy_new_for_bus_sync(G_BUS_TYPE_SESSION,
 						G_DBUS_PROXY_FLAGS_NONE,
-						"org.freedesktop.miracle.Sender",
+						"org.freedesktop.miracle",
 						"/org/freedesktop/miracle/Sender/0",
 						NULL,
 						&error);
diff --git a/src/stream/CMakeLists.txt b/src/stream/CMakeLists.txt
index d87e785..c8d754e 100644
--- a/src/stream/CMakeLists.txt
+++ b/src/stream/CMakeLists.txt
@@ -21,7 +21,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sender-iface.c
 				   COMMAND ${GDBUS_CODEGEN_EXEC}
 				   ARGS --generate-c-code sender-iface
 						--annotate org.freedesktop.miracle.Sender org.gtk.GDBus.C.Name Sender
-						--interface-prefix org.freedesktop.Miracle
+						--interface-prefix org.freedesktop.miracle
 						${CMAKE_CURRENT_SOURCE_DIR}/sender-iface.xml
 				   DEPENDS sender-iface.xml
 				   COMMENT "generating sender interface"
diff --git a/src/stream/sender.c b/src/stream/sender.c
index 08a865c..f178159 100644
--- a/src/stream/sender.c
+++ b/src/stream/sender.c
@@ -434,7 +434,7 @@ static void sender_on_name_acquired(GDBusConnection *conn,
 	result = g_dbus_interface_skeleton_export(
 					G_DBUS_INTERFACE_SKELETON(self->skeleton),
 					conn,
-					"/org/freedesktop/miracle/Sender/0",
+					"/org/freedesktop/miracle/Senders/0",
 					&error);
 	if(!result) {
 		g_error("failed to expose object");
@@ -464,7 +464,7 @@ static gint sender_impl_init(struct SenderImpl *self)
 	}
 
 	self->bus_owner_id = g_bus_own_name(G_BUS_TYPE_SESSION,
-				"org.freedesktop.miracle.Sender",
+				"org.freedesktop.miracle",
 				G_BUS_NAME_OWNER_FLAGS_NONE,
 				NULL,
 				sender_on_name_acquired,