aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-21 03:29:41 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-21 03:29:41 +0800
commitd458f689738ad5a94b3355fe73c167e469bce2dc (patch)
tree925bcac5d9aea2eb480739ba7b3b490b53eb67b7
parent8bd008f556dcab022cceb2eaceb3080cb7198efc (diff)
downloadgsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.tar
gsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.tar.gz
gsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.tar.bz2
gsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.tar.lz
gsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.tar.xz
gsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.tar.zst
gsoc2013-empathy-d458f689738ad5a94b3355fe73c167e469bce2dc.zip
Use new api to get connections
-rw-r--r--libempathy/empathy-dispatcher.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 47e214c8d..927cd5c3e 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++)
{