diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-30 23:06:32 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-30 23:06:32 +0000 |
| commit | 1dcacffc325e50754d4cc3338822d1f03c8b6e45 (patch) | |
| tree | 2e41d02141bf61be249ee6a9f8df6bd891a7d1e1 /dbus/dbus-glib-lowlevel.h | |
| parent | 4d985d98906577e3344fc1107d341b8ac969db1e (diff) | |
2005-01-30 Havoc Pennington <hp@redhat.com>
* glib/dbus-glib.c (dbus_g_pending_call_set_notify): new function
(dbus_g_pending_call_cancel): new function
* dbus/dbus-glib.h: move GType decls for connection/message here;
* dbus/dbus-glib.c: move all the g_type and ref/unref stuff in
here, just kind of rationalizing how we handle all that
* tools/dbus-names-model.c: new file for a tree model listing the
services on a bus
* tools/dbus-tree-view.c (model_new): use proper typing on the
model rows
Diffstat (limited to 'dbus/dbus-glib-lowlevel.h')
| -rw-r--r-- | dbus/dbus-glib-lowlevel.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dbus/dbus-glib-lowlevel.h b/dbus/dbus-glib-lowlevel.h index a689a926..94132151 100644 --- a/dbus/dbus-glib-lowlevel.h +++ b/dbus/dbus-glib-lowlevel.h @@ -32,15 +32,12 @@ G_BEGIN_DECLS void dbus_set_g_error (GError **gerror, DBusError *derror); -#define DBUS_TYPE_CONNECTION (dbus_connection_get_g_type ()) -#define DBUS_TYPE_MESSAGE (dbus_message_get_g_type ()) -GType dbus_connection_get_g_type (void) G_GNUC_CONST; -GType dbus_message_get_g_type (void) G_GNUC_CONST; - -#define DBUS_TYPE_G_CONNECTION (dbus_g_connection_get_g_type ()) -#define DBUS_TYPE_G_MESSAGE (dbus_g_message_get_g_type ()) -GType dbus_g_connection_get_g_type (void) G_GNUC_CONST; -GType dbus_g_message_get_g_type (void) G_GNUC_CONST; +#define DBUS_TYPE_CONNECTION (dbus_connection_get_g_type ()) +#define DBUS_TYPE_MESSAGE (dbus_message_get_g_type ()) +#define DBUS_TYPE_PENDING_CALL (dbus_pending_call_get_g_type ()) +GType dbus_connection_get_g_type (void) G_GNUC_CONST; +GType dbus_message_get_g_type (void) G_GNUC_CONST; +GType dbus_pending_call_get_g_type (void) G_GNUC_CONST; void dbus_connection_setup_with_g_main (DBusConnection *connection, GMainContext *context); |