diff options
| author | Colin Walters <walters@verbum.org> | 2005-05-25 16:03:53 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-05-25 16:03:53 +0000 |
| commit | 0b7923b4cfdfde00ecfb7b42c9ea0bc991c1cba6 (patch) | |
| tree | 91f485dabf0e054629f1ffd9c941639b3429998b | |
| parent | 29c49bce41d39513b6d3946403be81b77ee68ba8 (diff) | |
2005-05-25 Colin Walters <walters@verbum.org>
* dbus/dbus-protocol.h: Move various bus service #defines such
as DBUS_SERVICE_DBUS and DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT to
dbus/dbus-shared.h.
* dbus/dbus-shared.h: Various defines moved here.
* dbus/dbus-marshal-header.c: Include dbus-shared.h.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/dbus-marshal-header.c | 1 | ||||
| -rw-r--r-- | dbus/dbus-protocol.h | 35 | ||||
| -rw-r--r-- | dbus/dbus-shared.h | 35 |
4 files changed, 44 insertions, 35 deletions
@@ -1,3 +1,11 @@ +2005-05-25 Colin Walters <walters@verbum.org> + + * dbus/dbus-protocol.h: Move various bus service #defines such + as DBUS_SERVICE_DBUS and DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT to + dbus/dbus-shared.h. + * dbus/dbus-shared.h: Various defines moved here. + * dbus/dbus-marshal-header.c: Include dbus-shared.h. + 2005-05-25 John (J5) Palmieri <johnp@redhat.com> * python/__init__.py: Python bindings deserve a minor version diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index 3df19602..967a01e3 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -21,6 +21,7 @@ * */ +#include "dbus/dbus-shared.h" #include "dbus-marshal-header.h" #include "dbus-marshal-recursive.h" #include "dbus-marshal-byteswap.h" diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index df5bfedc..7f471b3d 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -202,41 +202,6 @@ extern "C" { */ #define DBUS_MINIMUM_HEADER_SIZE 16 -/* Services */ -#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" - -/* Paths */ -#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_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_LOCAL "org.freedesktop.DBus.Local" - -/* Owner flags */ -#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0x1 -#define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 - -/* Replies to request for a name */ -#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1 -#define DBUS_REQUEST_NAME_REPLY_IN_QUEUE 2 -#define DBUS_REQUEST_NAME_REPLY_EXISTS 3 -#define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4 - -/* Replies to service starts */ -#define DBUS_START_REPLY_SUCCESS 1 -#define DBUS_START_REPLY_ALREADY_RUNNING 2 - /* Errors */ /* WARNING these get autoconverted to an enum in dbus-glib.h. Thus, * if you change the order it breaks the ABI. Keep them in order. diff --git a/dbus/dbus-shared.h b/dbus/dbus-shared.h index 4fca1c57..a1f49a02 100644 --- a/dbus/dbus-shared.h +++ b/dbus/dbus-shared.h @@ -46,6 +46,41 @@ typedef enum DBUS_HANDLER_RESULT_NEED_MEMORY /**< Need more memory to return another result */ } DBusHandlerResult; +/* Services */ +#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" + +/* Paths */ +#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_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_LOCAL "org.freedesktop.DBus.Local" + +/* Owner flags */ +#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0x1 +#define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 + +/* Replies to request for a name */ +#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1 +#define DBUS_REQUEST_NAME_REPLY_IN_QUEUE 2 +#define DBUS_REQUEST_NAME_REPLY_EXISTS 3 +#define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4 + +/* Replies to service starts */ +#define DBUS_START_REPLY_SUCCESS 1 +#define DBUS_START_REPLY_ALREADY_RUNNING 2 + #ifdef __cplusplus } #endif |