diff options
| author | Colin Walters <walters@verbum.org> | 2005-02-17 21:19:49 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-02-17 21:19:49 +0000 |
| commit | 248895207dc15914ac7970a6d1431308075dca1d (patch) | |
| tree | 3a70902ef3623a2b93d35bdc7daa9f966f9d414b /dbus/dbus-protocol.h | |
| parent | dc12fac5f8a36d0276719bc5a98aa63bffe86399 (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 'dbus/dbus-protocol.h')
| -rw-r--r-- | dbus/dbus-protocol.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index c662d721..d48c3e84 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -203,25 +203,25 @@ extern "C" { #define DBUS_MINIMUM_HEADER_SIZE 16 /* Services */ -#define DBUS_SERVICE_ORG_FREEDESKTOP_DBUS "org.freedesktop.DBus" +#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" /* Paths */ -#define DBUS_PATH_ORG_FREEDESKTOP_DBUS "/org/freedesktop/DBus" -#define DBUS_PATH_ORG_FREEDESKTOP_LOCAL "/org/freedesktop/Local" +#define DBUS_PATH_DBUS "/org/freedesktop/DBus" +#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local" /* Interfaces, these #define don't do much other than * catch typos at compile time */ -#define DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS "org.freedesktop.DBus" -#define DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE "org.freedesktop.Introspectable" -#define DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES "org.freedesktop.Properties" -#define DBUS_INTERFACE_ORG_FREEDESKTOP_PEER "org.freedesktop.Peer" +#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" +#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" +#define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" +#define DBUS_INTERFACE_PEER "org.freedesktop.DBus.Peer" /* This is a special interface whose methods can only be invoked * by the local implementation (messages from remote apps aren't * allowed to specify this interface). */ -#define DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL "org.freedesktop.Local" +#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local" /* Owner flags */ #define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0x1 |