diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-01-26 13:09:47 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-01-26 13:09:47 +0000 |
| commit | e142bebe3e112d715af2b4784b24730eb9c310a0 (patch) | |
| tree | 594393ed618bf82b4600f61c624de58ad3340ca1 /src/disco.c | |
| parent | a2a603bdfb12bc9aa80726bf1f822cc22c76917e (diff) | |
| parent | 035a6b0a6e8ce1787abf2583bb918436282026fe (diff) | |
Merge branch 'master' into BYE-BYE-LOUDMOUTH
Conflicts:
src/connection.c
src/connection.h
src/ft-manager.c
src/jingle-content.c
src/jingle-factory.c
src/jingle-session.c
src/message-util.c
src/muc-channel.c
src/muc-channel.h
Diffstat (limited to 'src/disco.c')
| -rw-r--r-- | src/disco.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/disco.c b/src/disco.c index fce4509a3..bee1c3e1b 100644 --- a/src/disco.c +++ b/src/disco.c @@ -26,8 +26,6 @@ #include <string.h> -#define DBUS_API_SUBJECT_TO_CHANGE - #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> #include <telepathy-glib/dbus.h> @@ -239,7 +237,7 @@ gabble_disco_dispose (GObject *object) g_free ((char *) item->name); g_free ((char *) item->category); g_free ((char *) item->type); - g_hash_table_destroy (item->features); + g_hash_table_unref (item->features); g_free (item); } @@ -657,7 +655,7 @@ item_info_cb (GabbleDisco *disco, item.features = keys; pipeline->callback (pipeline, &item, pipeline->user_data); - g_hash_table_destroy (keys); + g_hash_table_unref (keys); done: gabble_disco_fill_pipeline (disco, pipeline); @@ -842,8 +840,8 @@ gabble_disco_pipeline_destroy (gpointer self) gabble_disco_cancel_request (pipeline->disco, request); } - g_hash_table_destroy (pipeline->remaining_items); - g_ptr_array_free (pipeline->disco_pipeline, TRUE); + g_hash_table_unref (pipeline->remaining_items); + g_ptr_array_unref (pipeline->disco_pipeline); g_free (pipeline); } |