dbus/dbus dbus-shared.h, 1.3, 1.4 dbus-protocol.h, 1.41, 1.42 dbus-marshal-header.c, 1.11, 1.12

[Colin Walters]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv22559/dbus

Modified Files:
	dbus-shared.h dbus-protocol.h dbus-marshal-header.c 
Log Message:
2005-05-25  Colin Walters  <walters at 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.


Index: dbus-shared.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-shared.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbus-shared.h	18 Jan 2005 20:42:15 -0000	1.3
+++ dbus-shared.h	25 May 2005 16:03:53 -0000	1.4
@@ -46,6 +46,41 @@
   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

Index: dbus-protocol.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-protocol.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dbus-protocol.h	24 Feb 2005 16:03:56 -0000	1.41
+++ dbus-protocol.h	25 May 2005 16:03:53 -0000	1.42
@@ -202,41 +202,6 @@
  */
 #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.

Index: dbus-marshal-header.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal-header.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-marshal-header.c	19 Apr 2005 13:14:55 -0000	1.11
+++ dbus-marshal-header.c	25 May 2005 16:03:53 -0000	1.12
@@ -21,6 +21,7 @@
  *
  */
 
+#include "dbus/dbus-shared.h"
 #include "dbus-marshal-header.h"
 #include "dbus-marshal-recursive.h"
 #include "dbus-marshal-byteswap.h"