From d339921eaf86de17aaae585070ae479cfbf4734f Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 11 Aug 2010 15:28:09 +0200 Subject: empathy_dispatcher_join_muc: get an account instead of a connection --- libempathy/empathy-dispatcher.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libempathy/empathy-dispatcher.c') diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index e5abfde8b..a286d5079 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -1305,9 +1305,9 @@ dispatcher_request_handles_cb (TpConnection *connection, } void -empathy_dispatcher_join_muc (TpConnection *connection, - const gchar *roomname, - gint64 timestamp) +empathy_dispatcher_join_muc (TpAccount *account, + const gchar *roomname, + gint64 timestamp) { EmpathyDispatcher *self; EmpathyDispatcherPriv *priv; @@ -1315,13 +1315,18 @@ empathy_dispatcher_join_muc (TpConnection *connection, ConnectionData *connection_data; const gchar *names[] = { roomname, NULL }; TpProxyPendingCall *call; + TpConnection *connection; - g_return_if_fail (TP_IS_CONNECTION (connection)); + g_return_if_fail (TP_IS_ACCOUNT (account)); g_return_if_fail (!EMP_STR_EMPTY (roomname)); self = empathy_dispatcher_dup_singleton (); priv = GET_PRIV (self); + connection = tp_account_get_connection (account); + if (connection == NULL) + return; + connection_data = g_hash_table_lookup (priv->connections, connection); g_assert (connection_data != NULL); -- cgit v1.2.3