[empathy/mc5: 466/483] Use new api to get connections



commit d458f689738ad5a94b3355fe73c167e469bce2dc
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Thu Aug 20 20:29:41 2009 +0100

    Use new api to get connections

 libempathy/empathy-dispatcher.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 47e214c..927cd5c 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1802,12 +1802,16 @@ empathy_dispatcher_handle_channels (TpSvcClientHandler *self,
 
   account = empathy_account_manager_get_account (priv->account_manager,
     account_path);
-  /* FIXME */
   g_assert (account != NULL);
 
-  connection = empathy_account_get_connection (account);
-  /* FIXME */
-  g_assert (connection != NULL);
+  connection = empathy_account_get_connection_for (account, connection_path);
+  if (connection == NULL)
+    {
+      GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+        "Invalid connection argument" };
+      dbus_g_method_return_error (context, &error);
+      return;
+    }
 
   for (i = 0; i < channels->len ; i++)
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]