diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-09-03 02:08:25 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-09-03 02:08:25 +0000 |
| commit | d021cfae6695f0f44102edf758abfc42e2f3c093 (patch) | |
| tree | 77e95134b676c65557962d50a4eab125a40e6d00 /dbus | |
| parent | 7b4ac5de11d90e9f7048f057d70d3da5104388b6 (diff) | |
2003-09-01 Havoc Pennington <hp@pobox.com>
* glib/dbus-gparser.c: implement
* glib/dbus-gobject.c: start implementing skeletons support
* configure.in: when disabling checks/assert, also define
G_DISABLE_ASSERT and G_DISABLE_CHECKS
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-marshal.c | 4 | ||||
| -rw-r--r-- | dbus/dbus-protocol.h | 23 |
2 files changed, 14 insertions, 13 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c index 5297cb67..c542ee8b 100644 --- a/dbus/dbus-marshal.c +++ b/dbus/dbus-marshal.c @@ -1473,7 +1473,8 @@ _dbus_demarshal_string_array (const DBusString *str, #define VERBOSE_DECOMPOSE 0 /** - * Demarshals an object path. + * Demarshals an object path. A path of just "/" is + * represented as an empty vector of strings. * * @param str the string containing the data * @param byte_order the byte order @@ -1556,7 +1557,6 @@ _dbus_demarshal_object_path (const DBusString *str, i = j; } _dbus_assert (i == len); - _dbus_assert (retval[0] != NULL); *path = retval; if (path_len) diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index e56ab756..473a1051 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -87,6 +87,18 @@ extern "C" { #define DBUS_PATH_ORG_FREEDESKTOP_DBUS "/org/freedesktop/DBus" #define DBUS_PATH_ORG_FREEDESKTOP_LOCAL "/org/freedesktop/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" + +/* 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" + /* Service owner flags */ #define DBUS_SERVICE_FLAG_PROHIBIT_REPLACEMENT 0x1 #define DBUS_SERVICE_FLAG_REPLACE_EXISTING 0x2 @@ -101,17 +113,6 @@ extern "C" { #define DBUS_ACTIVATION_REPLY_ACTIVATED 0x0 #define DBUS_ACTIVATION_REPLY_ALREADY_ACTIVE 0x1 -/* Interfaces, these #define don't do much other than - * catch typos at compile time - */ -#define DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS "org.freedesktop.DBus" - -/* 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" - #ifdef __cplusplus } #endif |