diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 22:20:42 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 22:20:42 +0800 |
commit | 95efa6ca70aa8cf1dc3283706c2254f45cad59c5 (patch) | |
tree | 003064fac6c22f387e9f21dfabe455801fbc4b77 /src/empathy-new-chatroom-dialog.c | |
parent | 9a48fa95672a4e3287dc6564f676bed5dbb7d358 (diff) | |
parent | 734ecf362e856ea8cc61f119dc371cd90b7851af (diff) | |
download | gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.gz gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.bz2 gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.lz gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.xz gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.zst gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.zip |
Merge branch 'request-chat-626630'
Diffstat (limited to 'src/empathy-new-chatroom-dialog.c')
-rw-r--r-- | src/empathy-new-chatroom-dialog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 88003e948..63e766449 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -714,7 +714,7 @@ static void new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) { EmpathyAccountChooser *account_chooser; - TpConnection *connection; + TpAccount *account; const gchar *room; const gchar *server = NULL; gchar *room_name = NULL; @@ -723,7 +723,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) server = gtk_entry_get_text (GTK_ENTRY (dialog->entry_server)); account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser); - connection = empathy_account_chooser_get_connection (account_chooser); + account = empathy_account_chooser_get_account (account_chooser); if (!EMP_STR_EMPTY (server)) { room_name = g_strconcat (room, "@", server, NULL); @@ -734,7 +734,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) g_strstrip (room_name); DEBUG ("Requesting channel for '%s'", room_name); - empathy_dispatcher_join_muc (connection, room_name, + empathy_dispatcher_join_muc (account, room_name, gtk_get_current_event_time ()); g_free (room_name); |