[telepathy-glib/master] account{, -manager}: cast const GError*s to GError* when passing to g_simple_async_result_set_from_error

[Jonny Lamb]

gio changed this argument from GError * (in 2.20) to const GError * in
(2.22)[0]. Instead of depending on >= 2.22, we can just cast to GError *
and it'll work in both versions.

0. http://git.gnome.org/cgit/glib/commit/?id=cdd04f36cac838f92826cbf415868100a4007741

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 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 4fc8255..72dce68 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1191,7 +1191,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_set_from_error (my_res, (GError *) 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 da1c62c..830e295 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1526,7 +1526,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, error);
+      g_simple_async_result_set_from_error (result, (GError *) error);
     }
 
   g_simple_async_result_complete (result);
@@ -1621,7 +1621,7 @@ _tp_account_reconnected_cb (TpAccount *proxy,
   GSimpleAsyncResult *result = user_data;
 
   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 (result);
   g_object_unref (result);
@@ -1779,7 +1779,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, error);
+    g_simple_async_result_set_from_error (result, (GError *) error);
   else
     g_simple_async_result_set_op_res_gpointer (result, reconnect_required, NULL);
 
@@ -2022,7 +2022,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, error);
+    g_simple_async_result_set_from_error (result, (GError *) error);
 
   g_simple_async_result_complete (result);
   g_object_unref (G_OBJECT (result));
@@ -2396,7 +2396,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, error);
+      g_simple_async_result_set_from_error (result, (GError *) error);
     }
   else
     {
-- 
1.5.6.5