summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--telepathy-glib/account-channel-request.c2
-rw-r--r--telepathy-glib/account-manager.c4
-rw-r--r--telepathy-glib/account.c33
-rw-r--r--telepathy-glib/base-client.c2
-rw-r--r--telepathy-glib/channel-dispatch-operation.c14
-rw-r--r--telepathy-glib/channel-dispatcher.c2
-rw-r--r--telepathy-glib/channel.c8
-rw-r--r--telepathy-glib/connection-aliasing.c2
-rw-r--r--telepathy-glib/connection-avatars.c2
-rw-r--r--telepathy-glib/connection-contact-info.c2
-rw-r--r--telepathy-glib/connection-contact-list.c10
-rw-r--r--telepathy-glib/connection.c4
-rw-r--r--telepathy-glib/contact.c2
-rw-r--r--telepathy-glib/file-transfer-channel.c6
-rw-r--r--telepathy-glib/stream-tube-channel.c4
-rw-r--r--telepathy-glib/text-channel.c18
16 files changed, 50 insertions, 65 deletions
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index 7e7235115..9a28a9303 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -534,7 +534,7 @@ complete_result (TpAccountChannelRequest *self)
request_disconnect (self);
- g_simple_async_result_complete (self->priv->result);
+ g_simple_async_result_complete_in_idle (self->priv->result);
tp_clear_object (&self->priv->result);
}
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 231223437..2b7ce85ff 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1234,7 +1234,7 @@ _tp_account_manager_created_cb (TpAccountManager *proxy,
if (error != NULL)
{
g_simple_async_result_set_from_error (my_res, error);
- g_simple_async_result_complete (my_res);
+ g_simple_async_result_complete_in_idle (my_res);
return;
}
@@ -1243,7 +1243,7 @@ _tp_account_manager_created_cb (TpAccountManager *proxy,
if (account == NULL)
{
g_simple_async_result_take_error (my_res, e);
- g_simple_async_result_complete (my_res);
+ g_simple_async_result_complete_in_idle (my_res);
return;
}
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 005a29d8b..7830b0bbf 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -569,7 +569,7 @@ _tp_account_got_all_storage_cb (TpProxy *proxy,
if (self->priv->storage_provider == NULL)
self->priv->storage_provider = g_strdup ("");
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
static void
@@ -2414,7 +2414,7 @@ _tp_account_property_set_cb (TpProxy *proxy,
g_simple_async_result_set_from_error (result, error);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -2476,7 +2476,7 @@ tp_account_set_enabled_async (TpAccount *account,
}
static void
-_tp_account_reconnected_cb (TpAccount *proxy,
+_tp_account_void_cb (TpAccount *proxy,
const GError *error,
gpointer user_data,
GObject *weak_object)
@@ -2486,7 +2486,7 @@ _tp_account_reconnected_cb (TpAccount *proxy,
if (error != NULL)
g_simple_async_result_set_from_error (result, error);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -2534,7 +2534,7 @@ tp_account_reconnect_async (TpAccount *account,
result = g_simple_async_result_new (G_OBJECT (account),
callback, user_data, tp_account_reconnect_finish);
- tp_cli_account_call_reconnect (account, -1, _tp_account_reconnected_cb,
+ tp_cli_account_call_reconnect (account, -1, _tp_account_void_cb,
result, NULL, G_OBJECT (account));
}
@@ -2688,7 +2688,7 @@ _tp_account_updated_cb (TpAccount *proxy,
g_simple_async_result_set_op_res_gpointer (result,
g_strdupv ((GStrv) reconnect_required), (GDestroyNotify) g_strfreev);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (G_OBJECT (result));
}
@@ -3008,21 +3008,6 @@ tp_account_set_icon_name_finish (TpAccount *account,
_tp_implement_finish_void (account, tp_account_set_icon_name_finish);
}
-static void
-_tp_account_void_cb (TpAccount *proxy,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data);
-
- if (error != NULL)
- g_simple_async_result_set_from_error (result, error);
-
- g_simple_async_result_complete (result);
- g_object_unref (G_OBJECT (result));
-}
-
/**
* tp_account_remove_async:
* @account: a #TpAccount
@@ -3405,7 +3390,7 @@ _tp_account_got_avatar_cb (TpProxy *proxy,
(GDestroyNotify) g_array_unref);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -3920,7 +3905,7 @@ _tp_account_get_storage_specific_information_cb (TpProxy *self,
(GDestroyNotify) g_hash_table_unref);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -4058,7 +4043,7 @@ _tp_account_got_all_addressing_cb (TpProxy *proxy,
if (self->priv->uri_schemes == NULL)
self->priv->uri_schemes = g_new0 (gchar *, 1);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
static void
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 26cd1cb37..6a09d31ae 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -3181,7 +3181,7 @@ delegate_channels_cb (TpChannelDispatcher *cd,
}
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
/**
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index 690e36fee..6dd359e9c 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -649,7 +649,7 @@ out:
if (e != NULL)
g_simple_async_result_set_from_error (result, e);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
if (!prepared)
{
@@ -1079,7 +1079,7 @@ handle_with_cb (TpChannelDispatchOperation *self,
g_simple_async_result_set_from_error (result, error);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1167,7 +1167,7 @@ claim_cb (TpChannelDispatchOperation *self,
g_simple_async_result_set_from_error (result, error);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1339,7 +1339,7 @@ claim_with_cb (TpChannelDispatchOperation *self,
_tp_base_client_now_handling_channels (client, self->priv->channels);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1450,7 +1450,7 @@ claim_close_channels_cb (TpChannelDispatchOperation *self,
tp_channel_close_async (channel, channel_close_cb, NULL);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1580,7 +1580,7 @@ claim_leave_channels_cb (TpChannelDispatchOperation *self,
channel_leave_cb, NULL);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1691,7 +1691,7 @@ claim_destroy_channels_cb (TpChannelDispatchOperation *self,
tp_channel_destroy_async (channel, channel_destroy_cb, NULL);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
diff --git a/telepathy-glib/channel-dispatcher.c b/telepathy-glib/channel-dispatcher.c
index 0f5452479..9e8819d19 100644
--- a/telepathy-glib/channel-dispatcher.c
+++ b/telepathy-glib/channel-dispatcher.c
@@ -183,7 +183,7 @@ present_channel_cb (TpChannelDispatcher *cd,
g_simple_async_result_set_from_error (result, error);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
/**
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 80bc77072..1b6329abd 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -744,7 +744,7 @@ tp_channel_get_initial_chat_states_cb (TpProxy *proxy,
/* else just ignore it and assume everyone was initially in the default
* Inactive state, unless we already saw a signal for them */
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
static void
@@ -1427,7 +1427,7 @@ got_password_flags_cb (TpChannel *self,
}
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
static void
@@ -2751,7 +2751,7 @@ channel_destroy_cb (TpChannel *channel,
return;
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -2876,7 +2876,7 @@ provide_password_cb (TpChannel *self,
TP_ERROR_AUTHENTICATION_FAILED, "Password was not correct");
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
/**
diff --git a/telepathy-glib/connection-aliasing.c b/telepathy-glib/connection-aliasing.c
index 5e0eec3d7..5bf7dd795 100644
--- a/telepathy-glib/connection-aliasing.c
+++ b/telepathy-glib/connection-aliasing.c
@@ -90,7 +90,7 @@ get_alias_flag_cb (TpConnection *self,
self->priv->alias_flags = flags;
finally:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
void
diff --git a/telepathy-glib/connection-avatars.c b/telepathy-glib/connection-avatars.c
index 7c590f4a0..fdec53099 100644
--- a/telepathy-glib/connection-avatars.c
+++ b/telepathy-glib/connection-avatars.c
@@ -85,7 +85,7 @@ tp_connection_get_avatar_requirements_cb (TpProxy *proxy,
tp_asv_get_uint32 (properties, "MaximumAvatarBytes", NULL));
finally:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
void
diff --git a/telepathy-glib/connection-contact-info.c b/telepathy-glib/connection-contact-info.c
index c1b0ba879..e33b6491f 100644
--- a/telepathy-glib/connection-contact-info.c
+++ b/telepathy-glib/connection-contact-info.c
@@ -475,7 +475,7 @@ tp_connection_get_contact_info_cb (TpProxy *proxy,
}
finally:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
void
diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c
index ae6d0890e..a5f71c92e 100644
--- a/telepathy-glib/connection-contact-list.c
+++ b/telepathy-glib/connection-contact-list.c
@@ -289,7 +289,7 @@ got_contact_list_attributes_cb (TpConnection *self,
OUT:
if (result != NULL)
{
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
}
@@ -404,7 +404,7 @@ prepare_contact_list_props_cb (TpProxy *proxy,
self->priv->contact_list_state);
OUT:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
void _tp_connection_prepare_contact_list_async (TpProxy *proxy,
@@ -614,7 +614,7 @@ prepare_contact_groups_cb (TpProxy *proxy,
g_ptr_array_add (self->priv->contact_groups, NULL);
OUT:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
void
@@ -1647,7 +1647,7 @@ blocked_changed_head_ready (TpConnection *self)
_tp_connection_set_contact_blocked (self, contact);
}
- g_simple_async_result_complete (item->result);
+ g_simple_async_result_complete_in_idle (item->result);
}
blocked_changed_item_free (item);
@@ -1821,7 +1821,7 @@ request_blocked_contacts_cb (TpConnection *self,
{
DEBUG ("Error calling RequestBlockedContacts: %s", error->message);
g_simple_async_result_set_from_error (result, error);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
return;
}
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index fe0ea5d65..8acd374d4 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -467,7 +467,7 @@ tp_connection_get_balance_cb (TpProxy *proxy,
g_object_thaw_notify ((GObject *) self);
finally:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
static void
@@ -542,7 +542,7 @@ tp_connection_get_rcc_cb (TpProxy *proxy,
finally:
while ((result = g_queue_pop_head (&self->priv->capabilities_queue)) != NULL)
{
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 185494544..3a73a9e0a 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -698,7 +698,7 @@ set_contact_groups_cb (TpConnection *connection,
g_simple_async_result_set_from_error (result, error);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c
index a046bd897..3cf0c2f8a 100644
--- a/telepathy-glib/file-transfer-channel.c
+++ b/telepathy-glib/file-transfer-channel.c
@@ -184,7 +184,7 @@ operation_failed (TpFileTransferChannel *self,
GError *error)
{
g_simple_async_result_take_error (self->priv->result, error);
- g_simple_async_result_complete (self->priv->result);
+ g_simple_async_result_complete_in_idle (self->priv->result);
tp_clear_object (&self->priv->result);
}
@@ -441,7 +441,7 @@ tp_file_transfer_channel_prepare_core_cb (TpProxy *proxy,
self->priv->file = g_file_new_for_uri (uri);
out:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
static void
@@ -1168,7 +1168,7 @@ accept_or_provide_file_cb (TpChannel *proxy,
start_transfer (self);
}
- g_simple_async_result_complete (self->priv->result);
+ g_simple_async_result_complete_in_idle (self->priv->result);
}
static gboolean
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index 4f266cf79..dc52f07e4 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -533,7 +533,7 @@ operation_failed (TpStreamTubeChannel *self,
{
g_simple_async_result_set_from_error (self->priv->result, error);
- g_simple_async_result_complete (self->priv->result);
+ g_simple_async_result_complete_in_idle (self->priv->result);
tp_clear_object (&self->priv->result);
}
@@ -1203,7 +1203,7 @@ _channel_offered (TpChannel *channel,
DEBUG ("Stream Tube offered");
- g_simple_async_result_complete (self->priv->result);
+ g_simple_async_result_complete_in_idle (self->priv->result);
tp_clear_object (&self->priv->result);
}
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index ccbe1525b..e56664bbb 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -639,7 +639,7 @@ get_pending_messages_cb (TpProxy *proxy,
error->domain, error->code,
"Failed to get PendingMessages property: %s", error->message);
- g_simple_async_result_complete (self->priv->pending_messages_result);
+ g_simple_async_result_complete_in_idle (self->priv->pending_messages_result);
g_clear_object (&self->priv->pending_messages_result);
return;
}
@@ -652,7 +652,7 @@ get_pending_messages_cb (TpProxy *proxy,
TP_ERRORS, TP_ERROR_CONFUSED,
"PendingMessages property is of the wrong type");
- g_simple_async_result_complete (self->priv->pending_messages_result);
+ g_simple_async_result_complete_in_idle (self->priv->pending_messages_result);
g_clear_object (&self->priv->pending_messages_result);
return;
}
@@ -661,7 +661,7 @@ get_pending_messages_cb (TpProxy *proxy,
if (messages->len == 0)
{
- g_simple_async_result_complete (self->priv->pending_messages_result);
+ g_simple_async_result_complete_in_idle (self->priv->pending_messages_result);
g_clear_object (&self->priv->pending_messages_result);
return;
}
@@ -753,7 +753,7 @@ get_sms_channel_cb (TpProxy *proxy,
g_object_notify (G_OBJECT (self), "is-sms-channel");
out:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1213,7 +1213,7 @@ send_message_cb (TpChannel *proxy,
g_simple_async_result_set_op_res_gpointer (result,
tp_str_empty (token) ? NULL : g_strdup (token), g_free);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1291,7 +1291,7 @@ acknowledge_pending_messages_ready_cb (GObject *object,
_tp_channel_contacts_queue_prepare_finish (channel, res, NULL, NULL);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1308,7 +1308,7 @@ acknowledge_pending_messages_cb (TpChannel *channel,
DEBUG ("Failed to ack messages: %s", error->message);
g_simple_async_result_set_from_error (result, error);
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return;
}
@@ -1509,7 +1509,7 @@ set_chat_state_cb (TpChannel *proxy,
g_simple_async_result_set_from_error (result, error);
}
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
}
@@ -1721,7 +1721,7 @@ get_sms_length_cb (TpChannel *proxy,
(GDestroyNotify) get_sms_length_return_free);
out:
- g_simple_async_result_complete (result);
+ g_simple_async_result_complete_in_idle (result);
}
/**
View Lorry Controller Status