Update D-Bus names to not use dash in names/paths.

OpenPrinting · Mar 25, 2024 · 4ed8121 · 4ed8121
1 parent dd09b24
commit 4ed8121
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/daemon/cups-locald-dbus.service.in b/daemon/cups-locald-dbus.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=org.openprinting.cups-locald
+Name=org.openprinting.cupslocald
 Exec=@sbindir@/cups-locald
 SystemdService=org.openprinting.cups-locald
diff --git a/daemon/dbus.c b/daemon/dbus.c
@@ -16,8 +16,8 @@
 // The D-Bus API is used to start cups-locald and return the proper Unix
 // domain socket to use.
 //
-// node /org/openprinting
-//   interface org.openprinting.cups-locald
+// node /org/openprinting/cupslocald
+//   interface org.openprinting.cupslocald
 //     methods:
 //       GetSocket(out s socketpath);
 //
@@ -55,7 +55,7 @@ LocalDBusService(void *data)		// I - Thread data (unused)
     // Parse any incoming messages...
     if ((msg = dbus_connection_pop_message(dbus)) != NULL)
     {
-      if (dbus_message_is_method_call(msg, "org.openprinting.cups-locald", "GetSocket"))
+      if (dbus_message_is_method_call(msg, "org.openprinting.cupslocald", "GetSocket"))
       {
         // Reply with the domain socket path...
 	DBusMessage	*reply;		// Reply message

diff --git a/daemon/org.openprinting.cups-locald.xml b/daemon/org.openprinting.cups-locald.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-	<interface name="org.openprinting.cups-locald">
+	<interface name="org.openprinting.cupslocald">
 		<method name="GetSocket">
 			<arg type="s" direction="out"/>
 		</method>