Skip to content

Commit 4ed8121

Browse files
committed
Update D-Bus names to not use dash in names/paths.
1 parent dd09b24 commit 4ed8121

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

daemon/cups-locald-dbus.service.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[D-BUS Service]
2-
Name=org.openprinting.cups-locald
2+
Name=org.openprinting.cupslocald
33
Exec=@sbindir@/cups-locald
44
SystemdService=org.openprinting.cups-locald

daemon/dbus.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// The D-Bus API is used to start cups-locald and return the proper Unix
1717
// domain socket to use.
1818
//
19-
// node /org/openprinting
20-
// interface org.openprinting.cups-locald
19+
// node /org/openprinting/cupslocald
20+
// interface org.openprinting.cupslocald
2121
// methods:
2222
// GetSocket(out s socketpath);
2323
//
@@ -55,7 +55,7 @@ LocalDBusService(void *data) // I - Thread data (unused)
5555
// Parse any incoming messages...
5656
if ((msg = dbus_connection_pop_message(dbus)) != NULL)
5757
{
58-
if (dbus_message_is_method_call(msg, "org.openprinting.cups-locald", "GetSocket"))
58+
if (dbus_message_is_method_call(msg, "org.openprinting.cupslocald", "GetSocket"))
5959
{
6060
// Reply with the domain socket path...
6161
DBusMessage *reply; // Reply message

daemon/org.openprinting.cups-locald.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
22
<node>
3-
<interface name="org.openprinting.cups-locald">
3+
<interface name="org.openprinting.cupslocald">
44
<method name="GetSocket">
55
<arg type="s" direction="out"/>
66
</method>

0 commit comments

Comments
 (0)