summaryrefslogtreecommitdiff
path: root/telepathy-glib/contact-search.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-01-28 12:00:16 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2011-01-28 12:09:17 +0000
commit1d636ae877f84cf82caac6bd3ae10f4216f651b1 (patch)
tree74045e47af649dcecfa7dd2b88e950b33d2da2cb /telepathy-glib/contact-search.c
parent2170d25419c7ed7119ca06ede93549d68a21f15f (diff)
downloadtelepathy-glib-1d636ae877f84cf82caac6bd3ae10f4216f651b1.tar.gz
Remove accidental GLib 2.28 dependency.
g_simple_async_result_take_error() and g_list_free_full() were added in GLib 2.28, which we don't claim to depend on.
Diffstat (limited to 'telepathy-glib/contact-search.c')
-rw-r--r--telepathy-glib/contact-search.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/telepathy-glib/contact-search.c b/telepathy-glib/contact-search.c
index 1f9ba3543..f9b95152b 100644
--- a/telepathy-glib/contact-search.c
+++ b/telepathy-glib/contact-search.c
@@ -181,7 +181,8 @@ _search_results_received (TpChannel *channel,
DEBUG ("SearchResultsReceived (%i results)", g_hash_table_size (result));
g_signal_emit (object, _signals[SEARCH_RESULTS_RECEIVED], 0, results);
- g_list_free_full (results, g_object_unref);
+ g_list_foreach (results, (GFunc) g_object_unref, NULL);
+ g_list_free (results);
}
static void
@@ -209,7 +210,8 @@ _create_search_channel_cb (GObject *source_object,
if (error != NULL)
{
DEBUG ("Failed to create search channel: %s", error->message);
- g_simple_async_result_take_error (self->priv->async_res, error);
+ g_simple_async_result_set_from_error (self->priv->async_res, error);
+ g_error_free (error);
goto out;
}
@@ -222,7 +224,8 @@ _create_search_channel_cb (GObject *source_object,
{
DEBUG ("Failed to connect SearchResultReceived: %s", error->message);
close_search_channel (self);
- g_simple_async_result_take_error (self->priv->async_res, error);
+ g_simple_async_result_set_from_error (self->priv->async_res, error);
+ g_error_free (error);
goto out;
}
@@ -233,7 +236,8 @@ _create_search_channel_cb (GObject *source_object,
{
DEBUG ("Failed to connect SearchStateChanged: %s", error->message);
close_search_channel (self);
- g_simple_async_result_take_error (self->priv->async_res, error);
+ g_simple_async_result_set_from_error (self->priv->async_res, error);
+ g_error_free (error);
goto out;
}