diff options
| author | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
| commit | 961e6ca41c1e9433055130569ce3492866e2126b (patch) | |
| tree | 053a3e24565665462a498dee93762a83b5598004 /tools | |
| parent | eed3989ea35a62e5f58ee7fc3f50a23ad0821800 (diff) | |
| download | dbus-961e6ca41c1e9433055130569ce3492866e2126b.tar.gz | |
2004-06-20 Havoc Pennington <hp@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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dbus-monitor.c | 4 | ||||
| -rw-r--r-- | tools/dbus-tree-view.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index 91668546..3795ee3f 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -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 diff --git a/tools/dbus-tree-view.h b/tools/dbus-tree-view.h index 1d59d342..1bc61f6b 100644 --- a/tools/dbus-tree-view.h +++ b/tools/dbus-tree-view.h @@ -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); |