[telepathy-mission-control/master] Make MC compile with dbus-glib 0.80 by casting const GError* back to GError*

[Danielle Madeley]

Ubuntu Karmic ships with dbus-glib 0.80. Which takes a GError* argument to
dbus_g_method_return_error(). We could either bump our minimum dbus-glib
version to 0.82, or cast the errors so that it works.

Reviewed-by: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
---
 src/mcd-account.c            |    2 +-
 src/mcd-dispatch-operation.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 5f08930..32eddc9 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -2072,7 +2072,7 @@ account_remove_delete_cb (McdAccount *account, const GError *error,
 
     if (error != NULL)
     {
-        dbus_g_method_return_error (data->context, error);
+        dbus_g_method_return_error (data->context, (GError *) error);
         return;
     }
 
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 1b39cad..2d1fafb 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -1565,7 +1565,7 @@ _mcd_dispatch_operation_set_handler_failed (McdDispatchOperation *self,
         if (approval->type == APPROVAL_TYPE_HANDLE_WITH &&
             !tp_strdiff (approval->client_bus_name, bus_name))
         {
-            dbus_g_method_return_error (approval->context, error);
+            dbus_g_method_return_error (approval->context, (GError *) error);
             approval->context = NULL;
             approval_free (approval);
             g_queue_delete_link (self->priv->approvals, iter);
-- 
1.5.6.5