[telepathy-glib/master] Revert "account{, -manager}: cast const GError*s to GError* when passing to g_simple_async_result_set_from_error"
Simon McVittie
simon.mcvittie at collabora.co.uk
Thu Jan 21 06:20:12 PST 2010
This reverts commit 5620910fe58d95d62754437eeabc7befa95675e6.
---
telepathy-glib/account-manager.c | 2 +-
telepathy-glib/account.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 2f9c0d9..484c1f9 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1241,7 +1241,7 @@ _tp_account_manager_created_cb (TpAccountManager *proxy,
if (error != NULL)
{
- g_simple_async_result_set_from_error (my_res, (GError *) error);
+ g_simple_async_result_set_from_error (my_res, error);
g_simple_async_result_complete (my_res);
g_object_unref (my_res);
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 7049f23..f96cf77 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1579,7 +1579,7 @@ _tp_account_property_set_cb (TpProxy *proxy,
if (error != NULL)
{
DEBUG ("Failed to set property: %s", error->message);
- g_simple_async_result_set_from_error (result, (GError *) error);
+ g_simple_async_result_set_from_error (result, error);
}
g_simple_async_result_complete (result);
@@ -1674,7 +1674,7 @@ _tp_account_reconnected_cb (TpAccount *proxy,
GSimpleAsyncResult *result = user_data;
if (error != NULL)
- g_simple_async_result_set_from_error (result, (GError *) error);
+ g_simple_async_result_set_from_error (result, error);
g_simple_async_result_complete (result);
g_object_unref (result);
@@ -1832,7 +1832,7 @@ _tp_account_updated_cb (TpAccount *proxy,
GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data);
if (error != NULL)
- g_simple_async_result_set_from_error (result, (GError *) error);
+ g_simple_async_result_set_from_error (result, error);
else
g_simple_async_result_set_op_res_gpointer (result, reconnect_required, NULL);
@@ -2075,7 +2075,7 @@ _tp_account_remove_cb (TpAccount *proxy,
GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data);
if (error != NULL)
- g_simple_async_result_set_from_error (result, (GError *) error);
+ g_simple_async_result_set_from_error (result, error);
g_simple_async_result_complete (result);
g_object_unref (G_OBJECT (result));
@@ -2449,7 +2449,7 @@ _tp_account_got_avatar_cb (TpProxy *proxy,
if (error != NULL)
{
DEBUG ("Failed to get avatar: %s", error->message);
- g_simple_async_result_set_from_error (result, (GError *) error);
+ g_simple_async_result_set_from_error (result, error);
}
else
{
--
1.5.6.5
More information about the telepathy-commits
mailing list