From 0b7923b4cfdfde00ecfb7b42c9ea0bc991c1cba6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 25 May 2005 16:03:53 +0000 Subject: 2005-05-25 Colin Walters * 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. --- dbus/dbus-protocol.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'dbus/dbus-protocol.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. -- cgit