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 /dbus/dbus-connection.h | |
| parent | eed3989ea35a62e5f58ee7fc3f50a23ad0821800 (diff) | |
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 'dbus/dbus-connection.h')
| -rw-r--r-- | dbus/dbus-connection.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h index 5dcbc8c0..fb6dfbcd 100644 --- a/dbus/dbus-connection.h +++ b/dbus/dbus-connection.h @@ -30,6 +30,7 @@ #include <dbus/dbus-errors.h> #include <dbus/dbus-memory.h> #include <dbus/dbus-message.h> +#include <dbus/dbus-shared.h> DBUS_BEGIN_DECLS; @@ -58,13 +59,6 @@ typedef enum DBUS_DISPATCH_NEED_MEMORY /**< More memory is needed to continue. */ } DBusDispatchStatus; -typedef enum -{ - DBUS_HANDLER_RESULT_HANDLED, /**< Message has had its effect */ - DBUS_HANDLER_RESULT_NOT_YET_HANDLED, /**< Message has not had any effect */ - DBUS_HANDLER_RESULT_NEED_MEMORY /**< Need more memory to return another result */ -} DBusHandlerResult; - typedef dbus_bool_t (* DBusAddWatchFunction) (DBusWatch *watch, void *data); typedef void (* DBusWatchToggledFunction) (DBusWatch *watch, |