diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-01-10 00:13:04 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-10 00:13:04 +0800 |
| commit | 4f5bfccceec4707e5e3a6ca3596ff9fb88507464 (patch) | |
| tree | b49bd3148dde333d76161393f806479abea06075 /src/empathy-new-chatroom-dialog.c | |
| parent | 5436ecf05f66615d13540c19968361feda55c033 (diff) | |
| download | gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.tar gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.tar.gz gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.tar.bz2 gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.tar.lz gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.tar.xz gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.tar.zst gsoc2013-empathy-4f5bfccceec4707e5e3a6ca3596ff9fb88507464.zip | |
Use new dispatcher API to get muc channels
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2145
Diffstat (limited to 'src/empathy-new-chatroom-dialog.c')
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 4a1fb90df..9c9a9a4cd 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -39,6 +39,7 @@ #include <libempathy/empathy-tp-roomlist.h> #include <libempathy/empathy-chatroom.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-dispatcher.h> #include <libempathy-gtk/empathy-account-chooser.h> #include <libempathy-gtk/empathy-ui-utils.h> @@ -489,8 +490,6 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) { EmpathyAccountChooser *account_chooser; McAccount *account; - MissionControl *mc; - TpConnection *connection; const gchar *room; const gchar *server = NULL; gchar *room_name = NULL; @@ -508,18 +507,9 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog) } DEBUG ("Requesting channel for '%s'", room_name); + empathy_dispatcher_join_muc (account, room_name, NULL, NULL); - mc = empathy_mission_control_new (); - connection = mission_control_get_tpconnection (mc, account, NULL); - tp_connection_run_until_ready (connection, TRUE, NULL, NULL); - empathy_connection_request_channel (connection, -1, - TP_IFACE_CHANNEL_TYPE_TEXT, - TP_HANDLE_TYPE_ROOM, - room_name, TRUE, - NULL, NULL, NULL, NULL); g_free (room_name); - g_object_unref (connection); - g_object_unref (mc); } static void |