[Telepathy-commits] [telepathy-gabble/master] raise a D-Bus error if sending view request failed

[Guillaume Desmottes]

---
 src/olpc-gadget-manager.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/olpc-gadget-manager.c b/src/olpc-gadget-manager.c
index 7cd71e6..496f441 100644
--- a/src/olpc-gadget-manager.c
+++ b/src/olpc-gadget-manager.c
@@ -459,6 +459,15 @@ gabble_olpc_gadget_manager_handle_request (TpChannelManager *manager,
       return TRUE;
     }
 
+  if (!gabble_olpc_view_send_request (channel, &error))
+    {
+      DEBUG ("view_send_request failed: %s", error->message);
+      tp_channel_manager_emit_request_failed (self, request_token,
+          error->domain, error->code, error->message);
+      g_error_free (error);
+      return TRUE;
+    }
+
   g_signal_connect (channel, "closed",
       (GCallback) olpc_gadget_channel_closed_cb, self);
   g_hash_table_insert (self->priv->channels,
@@ -469,9 +478,6 @@ gabble_olpc_gadget_manager_handle_request (TpChannelManager *manager,
       TP_EXPORTABLE_CHANNEL (channel), request_tokens);
   g_slist_free (request_tokens);
 
-  /* FIXME: raise a D-Bus error if failed */
-  gabble_olpc_view_send_request (channel, NULL);
-
   return TRUE;
 }
 
-- 
1.5.6.5