diff options
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-connection.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-protocol.h | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 2b4a7600..7f9423af 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -1488,7 +1488,7 @@ dbus_connection_send_with_reply_and_block (DBusConnection *connection, timeout_milliseconds = (end_tv_sec - tv_sec) * 1000 + (end_tv_usec - tv_usec) / 1000; _dbus_verbose ("%d milliseconds remain\n", timeout_milliseconds); - _dbus_assert (timeout_milliseconds > 0); + _dbus_assert (timeout_milliseconds >= 0); if (status == DBUS_DISPATCH_NEED_MEMORY) { diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 6bcc2060..51a694aa 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -1167,7 +1167,7 @@ dbus_message_append_args_valist (DBusMessage *message, case DBUS_TYPE_STRING_ARRAY: { int len; - char **data; + const char **data; data = va_arg (var_args, const char **); len = va_arg (var_args, int); diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index e0b0c985..c7eb737f 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -77,6 +77,10 @@ extern "C" { #define DBUS_SERVICE_REPLY_IN_QUEUE 0x2 #define DBUS_SERVICE_REPLY_SERVICE_EXISTS 0x4 #define DBUS_SERVICE_REPLY_ALREADY_OWNER 0x8 + +/* Activation replies */ +#define DBUS_ACTIVATION_REPLY_ACTIVATED 0x0 +#define DBUS_ACTIVATION_REPLY_ALREADY_ACTIVE 0x1 /* Messages */ #define DBUS_MESSAGE_ACTIVATE_SERVICE "org.freedesktop.DBus.ActivateService" @@ -88,7 +92,7 @@ extern "C" { #define DBUS_MESSAGE_SERVICE_CREATED "org.freedesktop.DBus.ServiceCreated" #define DBUS_MESSAGE_SERVICE_DELETED "org.freedesktop.DBus.ServiceDeleted" #define DBUS_MESSAGE_SERVICE_LOST "org.freedesktop.DBus.ServiceLost" - + #define DBUS_MESSAGE_LOCAL_DISCONNECT "org.freedesktop.Local.Disconnect" #ifdef __cplusplus |