dbus/tools dbus-monitor.c,1.9,1.10 dbus-tree-view.h,1.3,1.4

[Havoc Pennington]

Update of /cvs/dbus/dbus/tools
In directory pdx:/tmp/cvs-serv11424/tools

Modified Files:
	dbus-monitor.c dbus-tree-view.h 
Log Message:
2004-06-20  Havoc Pennington  <hp at redhat.com>

        * dbus/dbus-glib-error-enum.h: autogenerate the GError enum 
	codes from the dbus error names
	
        * glib/dbus-glib.h: move to subdir dbus/ since it's included 
	as dbus/dbus-glib.h and that breakage is now visible due to 
	including dbus/dbus-glib.h in dbus-glib-lowlevel.h
	
	* glib/dbus-glib.h: s/gproxy/g_proxy/

	* dbus/dbus-shared.h: new header to hold stuff shared with
	binding APIs
	
	* dbus/dbus-protocol.h (DBUS_ERROR_*): move errors here rather
	than dbus-errors.h

	* glib/dbus-glib.h (dbus_set_g_error): move to
	dbus-glib-lowlevel.h

	* glib/dbus-glib.h: remove dbus/dbus.h from here; change a bunch
	of stuff to enable this

	* dbus/dbus-glib-lowlevel.h: put dbus/dbus.h here

	* a bunch of other changes with the same basic "separate glib 
	bindings from dbus.h" theme
	


Index: dbus-monitor.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-monitor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-monitor.c	25 May 2004 18:02:17 -0000	1.9
+++ dbus-monitor.c	20 Jun 2004 15:28:15 -0000	1.10
@@ -24,9 +24,7 @@
 #include <string.h>
 
 #include <glib.h>
-#include <dbus/dbus.h>
- /* Don't copy this, for programs outside the dbus tree it's dbus/dbus-glib.h */
-#include <glib/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
 #include "dbus-print-message.h"
 
 static DBusHandlerResult

Index: dbus-tree-view.h
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-tree-view.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbus-tree-view.h	2 Dec 2003 10:44:22 -0000	1.3
+++ dbus-tree-view.h	20 Jun 2004 15:28:15 -0000	1.4
@@ -24,7 +24,7 @@
 #define DBUS_TREE_VIEW_H
 
 #include <gtk/gtk.h>
-#include <glib/dbus-glib.h>
+#include <dbus/dbus-glib.h>
 #include <glib/dbus-gidl.h>
 
 GtkWidget*   dbus_tree_view_new    (void);