summaryrefslogtreecommitdiffstats
path: root/glib/dbus-gobject.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-02-17 21:19:49 +0000
committerColin Walters <walters@verbum.org>2005-02-17 21:19:49 +0000
commit248895207dc15914ac7970a6d1431308075dca1d (patch)
tree3a70902ef3623a2b93d35bdc7daa9f966f9d414b /glib/dbus-gobject.c
parentdc12fac5f8a36d0276719bc5a98aa63bffe86399 (diff)
2005-02-17 Colin Walters <walters@verbum.org>
* dbus/dbus-protocol.h (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS): Rename to DBUS_SERVICE_DBUS. (DBUS_PATH_ORG_FREEDESKTOP_DBUS): Rename to DBUS_PATH_DBUS. (DBUS_PATH_ORG_FREEDESKTOP_LOCAL): Rename to DBUS_PATH_LOCAL. (DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS): Rename to DBUS_INTERFACE_DBUS. (DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE): Rename to DBUS_INTERFACE_INTROSPECTABLE. (DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES): Rename to DBUS_INTERFACE_PROPERTIES. (DBUS_INTERFACE_ORG_FREEDESKTOP_PEER): Rename to DBUS_INTERFACE_PEER. (DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL): DBUS_INTERFACE_LOCAL. All other users of those constants have been changed. * bus/driver.c (bus_driver_handle_introspect): Use constants. * glib/dbus-gobject.c (handle_introspect): Use constants. * doc/dbus-faq.xml, doc/dbus-specification.xml: Update for rename.
Diffstat (limited to 'glib/dbus-gobject.c')
-rw-r--r--glib/dbus-gobject.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 3bcd90d5..96eec473 100644
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -535,14 +535,14 @@ handle_introspect (DBusConnection *connection,
g_string_append (xml, "<node>\n");
/* We are introspectable, though I guess that was pretty obvious */
- g_string_append (xml, " <interface name=\"org.freedesktop.Introspectable\">\n");
+ g_string_append_printf (xml, " <interface name=\"%s\">\n", DBUS_INTERFACE_INTROSPECTABLE);
g_string_append (xml, " <method name=\"Introspect\">\n");
g_string_append (xml, " <arg name=\"data\" direction=\"out\" type=\"string\"/>\n");
g_string_append (xml, " </method>\n");
g_string_append (xml, " </interface>\n");
/* We support get/set properties */
- g_string_append (xml, " <interface name=\"org.freedesktop.Properties\">\n");
+ g_string_append_printf (xml, " <interface name=\"%s\">\n", DBUS_INTERFACE_PROPERTIES);
g_string_append (xml, " <method name=\"Get\">\n");
g_string_append (xml, " <arg name=\"interface\" direction=\"in\" type=\"string\"/>\n");
g_string_append (xml, " <arg name=\"propname\" direction=\"in\" type=\"string\"/>\n");
@@ -945,7 +945,7 @@ gobject_message_function (DBusConnection *connection,
object = G_OBJECT (user_data);
if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+ DBUS_INTERFACE_INTROSPECTABLE,
"Introspect"))
return handle_introspect (connection, message, object);
@@ -959,11 +959,11 @@ gobject_message_function (DBusConnection *connection,
getter = FALSE;
setter = FALSE;
if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES,
+ DBUS_INTERFACE_PROPERTIES,
"Get"))
getter = TRUE;
else if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES,
+ DBUS_INTERFACE_PROPERTIES,
"Set"))
setter = TRUE;