[telepathy-glib/master] Revert "fd.o#25600: account{, -manager}: make sure g_s_a_r_set_from_error gets a non-const GError*"

Simon McVittie simon.mcvittie at collabora.co.uk
Thu Jan 21 06:20:50 PST 2010


This reverts commit f047ad9811a24111ba264319dc7519a949335e1d.
---
 telepathy-glib/account-manager.c |    2 +-
 telepathy-glib/account.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 484c1f9..c47561c 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1437,7 +1437,7 @@ tp_account_manager_prepare_async (TpAccountManager *manager,
   error = tp_proxy_get_invalidated (manager);
   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_in_idle (result);
       g_object_unref (result);
       g_array_free (feature_array, TRUE);
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f96cf77..663f56f 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2616,7 +2616,7 @@ tp_account_prepare_async (TpAccount *account,
 
   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_in_idle (result);
       g_object_unref (result);
       g_array_free (feature_array, TRUE);
-- 
1.5.6.5




More information about the telepathy-commits mailing list