[telepathy-glib/master] fd.o#25600: account{, -manager}: make sure g_s_a_r_set_from_error gets a non-const GError*
Jonny Lamb
jonny.lamb at collabora.co.uk
Sat Dec 12 08:55:05 PST 2009
Rationale of this is explained in 5620910f. It just wasn't honoured
when adding new calls to this function.
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
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 71c506e..8e39daa 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, error);
+ g_simple_async_result_set_from_error (result, (GError *) 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 d8d77a5..348e98f 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2595,7 +2595,7 @@ tp_account_prepare_async (TpAccount *account,
if (error != NULL)
{
- g_simple_async_result_set_from_error (result, error);
+ g_simple_async_result_set_from_error (result, (GError *) 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