diff options
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-gobject.c | 10 | ||||
| -rw-r--r-- | glib/dbus-gproxy.c | 8 |
2 files changed, 9 insertions, 9 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; diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c index 364facf8..8967ccd2 100644 --- a/glib/dbus-gproxy.c +++ b/glib/dbus-gproxy.c @@ -580,7 +580,7 @@ dbus_g_proxy_manager_filter (DBusConnection *connection, LOCK_MANAGER (manager); if (dbus_message_is_signal (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + DBUS_INTERFACE_LOCAL, "Disconnected")) { /* Destroy all the proxies, quite possibly resulting in unreferencing @@ -1153,9 +1153,9 @@ dbus_g_proxy_new_for_name_owner (DBusGConnection *connection, unique_name = NULL; reply = NULL; - request = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + request = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "GetNameOwner"); if (request == NULL) g_error ("Out of memory"); |