diff options
| author | Havoc Pennington <hp@redhat.com> | 2002-12-24 06:37:33 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2002-12-24 06:37:33 +0000 |
| commit | 17fbe2b702cdc880abd6cbe117e620b6432f42e0 (patch) | |
| tree | 9dc357f6d6c5cd7dd4bfa2bc0dee1760d4ac366a /glib | |
| parent | 7af22a5ef9460af0f6afc2f1704d44b2e4c18ead (diff) | |
2002-12-24 Havoc Pennington <hp@pobox.com>
* glib/dbus-gthread.c: fix include
* glib/dbus-glib.h: rename DBusMessageHandler for now.
I think glib API needs to change, though, as you don't
want to use DBusMessageFunction, you want to use the
DBusMessageHandler object. Probably
dbus_connection_open_with_g_main_loop()
and dbus_connection_setup_g_main_loop() or something like that
(but think of better names...) that just create a connection
that has watch/timeout functions etc. already set up.
* dbus/dbus-connection.c
(dbus_connection_send_message_with_reply): new function just to
show how the message handler helps us deal with replies.
* dbus/dbus-list.c (_dbus_list_remove_last): new function
* dbus/dbus-string.c (_dbus_string_test): free a string that
wasn't
* dbus/dbus-hash.c: use memory pools for the hash entries
(rebuild_table): be more paranoid about overflow, and
shrink table when we can
(_dbus_hash_test): reduce number of sprintfs and write
valid C89. Add tests for case where we grow and then
shrink the hash table.
* dbus/dbus-mempool.h, dbus/dbus-mempool.c: memory pools
* dbus/dbus-connection.c (dbus_connection_register_handler)
(dbus_connection_unregister_handler): new functions
* dbus/dbus-message.c (dbus_message_get_name): new
* dbus/dbus-list.c: fix docs typo
* dbus/dbus-message-handler.h, dbus/dbus-message-handler.c:
an object representing a handler for messages.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-glib.h | 6 | ||||
| -rw-r--r-- | glib/dbus-gmain.c | 2 | ||||
| -rw-r--r-- | glib/dbus-gthread.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/glib/dbus-glib.h b/glib/dbus-glib.h index 0afd23bd..6abbc4fe 100644 --- a/glib/dbus-glib.h +++ b/glib/dbus-glib.h @@ -26,9 +26,9 @@ #include <dbus/dbus.h> #include <glib.h> -typedef void (*DBusMessageHandler) (DBusConnection *connection, - DBusMessage *message, - gpointer data); +typedef void (*DBusMessageFunction) (DBusConnection *connection, + DBusMessage *message, + gpointer data); void dbus_gthread_init (void); diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index 0b9ac9f1..7d22dbdd 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -88,7 +88,7 @@ gdbus_connection_dispatch (GSource *source, gpointer user_data) { DBusGSource *dbus_source = (DBusGSource *)source; - DBusMessageHandler handler = (DBusMessageHandler)callback; + DBusMessageFunction handler = (DBusMessageFunction)callback; DBusMessage *message; GList *list; diff --git a/glib/dbus-gthread.c b/glib/dbus-gthread.c index cb4733ff..685f4cd6 100644 --- a/glib/dbus-gthread.c +++ b/glib/dbus-gthread.c @@ -23,7 +23,7 @@ #include <glib.h> #include <dbus/dbus.h> -#include "dbus-gthread.h" +#include "dbus-glib.h" static DBusMutex * dbus_gmutex_new (void); static void dbus_gmutex_free (DBusMutex *mutex); |