]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-new-chatroom-dialog.c
Move chat chandler into the same process than contact list
[empathy.git] / libempathy-gtk / empathy-new-chatroom-dialog.c
index 31f61078931fb6425096ce303d5ba811c5709236..b33439407c6a97ad31e84cb280a216a6ebe18911 100644 (file)
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2006-2007 Imendio AB
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007-2008 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-profile.h>
 
+#include <libempathy/empathy-tp-roomlist.h>
+#include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-debug.h>
 
 #include "empathy-new-chatroom-dialog.h"
 #include "empathy-account-chooser.h"
-//#include "empathy-chatrooms-window.h"
 #include "empathy-ui-utils.h"
 #include "ephy-spinner.h"
 
 #define DEBUG_DOMAIN "NewChatroomDialog"
 
 typedef struct {
-       GtkWidget        *window;
-
-       GtkWidget        *vbox_widgets;
-
-       GtkWidget        *hbox_account;
-       GtkWidget        *label_account;
-       GtkWidget        *account_chooser;
-
-       GtkWidget        *hbox_server;
-       GtkWidget        *label_server;
-       GtkWidget        *entry_server;
-       GtkWidget        *togglebutton_refresh;
-       
-       GtkWidget        *hbox_room;
-       GtkWidget        *label_room;
-       GtkWidget        *entry_room;
-
-       GtkWidget        *hbox_nick;
-       GtkWidget        *label_nick;
-       GtkWidget        *entry_nick;
-
-       GtkWidget        *vbox_browse;
-       GtkWidget        *image_status;
-       GtkWidget        *label_status;
-       GtkWidget        *hbox_status;
-       GtkWidget        *throbber;
-       GtkWidget        *treeview;
-       GtkTreeModel     *model;
-       GtkTreeModel     *filter;
-
-       GtkWidget        *button_join;
-       GtkWidget        *button_close;
+       EmpathyTpRoomlist *room_list;
+
+       GtkWidget         *window;
+       GtkWidget         *vbox_widgets;
+       GtkWidget         *table_info;
+       GtkWidget         *label_account;
+       GtkWidget         *account_chooser;
+       GtkWidget         *label_server;
+       GtkWidget         *entry_server;
+       GtkWidget         *togglebutton_refresh;
+       GtkWidget         *label_room;
+       GtkWidget         *entry_room;
+       GtkWidget         *vbox_browse;
+       GtkWidget         *image_status;
+       GtkWidget         *label_status;
+       GtkWidget         *hbox_status;
+       GtkWidget         *throbber;
+       GtkWidget         *treeview;
+       GtkTreeModel      *model;
+       GtkWidget         *button_join;
+       GtkWidget         *button_close;
 } EmpathyNewChatroomDialog;
 
-typedef struct {
-       guint  handle;
-       gchar *channel_type;
-       gchar *name;
-       gchar *id;
-} EmpathyRoomListItem;
-
 enum {
-       COL_IMAGE,
        COL_NAME,
-       COL_POINTER,
+       COL_ROOM,
        COL_COUNT
 };
 
@@ -103,27 +85,21 @@ static void     new_chatroom_dialog_destroy_cb                      (GtkWidget
                                                                     EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_model_setup                     (EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_model_add_columns               (EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_update_buttons                  (EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_update_widgets                  (EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_account_changed_cb              (GtkComboBox             *combobox,
+static void     new_chatroom_dialog_account_changed_cb              (GtkComboBox              *combobox,
                                                                     EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_model_add                       (EmpathyNewChatroomDialog *dialog,
-                                                                    EmpathyRoomListItem     *item);
-static void     new_chatroom_dialog_model_clear                     (EmpathyNewChatroomDialog *dialog);
-static GList *  new_chatroom_dialog_model_get_selected              (EmpathyNewChatroomDialog *dialog);
-static gboolean new_chatroom_dialog_model_filter_func               (GtkTreeModel            *model,
-                                                                    GtkTreeIter             *iter,
+static void     new_chatroom_dialog_roomlist_destroy_cb             (EmpathyTpRoomlist        *room_list,
                                                                     EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_model_row_activated_cb          (GtkTreeView             *tree_view,
-                                                                    GtkTreePath             *path,
-                                                                    GtkTreeViewColumn       *column,
+static void     new_chatroom_dialog_new_room_cb                     (EmpathyTpRoomlist        *room_list,
+                                                                    EmpathyChatroom          *chatroom,
                                                                     EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_model_row_inserted_cb           (GtkTreeModel            *model,
-                                                                    GtkTreePath             *path,
-                                                                    GtkTreeIter             *iter,
+static void     new_chatroom_dialog_listing_cb                      (EmpathyTpRoomlist        *room_list,
+                                                                    gboolean                  listing,
                                                                     EmpathyNewChatroomDialog *dialog);
-static void     new_chatroom_dialog_model_row_deleted_cb            (GtkTreeModel            *model,
+static void     new_chatroom_dialog_model_clear                     (EmpathyNewChatroomDialog *dialog);
+static void     new_chatroom_dialog_model_row_activated_cb          (GtkTreeView             *tree_view,
                                                                     GtkTreePath             *path,
+                                                                    GtkTreeViewColumn       *column,
                                                                     EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_model_selection_changed         (GtkTreeSelection        *selection,
                                                                     EmpathyNewChatroomDialog *dialog);
@@ -143,10 +119,8 @@ void
 empathy_new_chatroom_dialog_show (GtkWindow *parent)
 {
        EmpathyNewChatroomDialog *dialog;
-       GladeXML                *glade;
-       GList                   *accounts;
-       gint                     account_num;
-       GtkSizeGroup            *size_group;
+       GladeXML                 *glade;
+       GtkSizeGroup             *size_group;
 
        if (dialog_p) {
                gtk_window_present (GTK_WINDOW (dialog_p->window));
@@ -159,18 +133,12 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
                                       "new_chatroom_dialog",
                                       NULL,
                                       "new_chatroom_dialog", &dialog->window,
-                                      "hbox_account", &dialog->hbox_account,
+                                      "table_info", &dialog->table_info,
                                       "label_account", &dialog->label_account,
-                                      "vbox_widgets", &dialog->vbox_widgets,
                                       "label_server", &dialog->label_server,
                                       "label_room", &dialog->label_room,
-                                      "label_nick", &dialog->label_nick,
-                                      "hbox_server", &dialog->hbox_server,
-                                      "hbox_room", &dialog->hbox_room,
-                                      "hbox_nick", &dialog->hbox_nick,
                                       "entry_server", &dialog->entry_server,
                                       "entry_room", &dialog->entry_room,
-                                      "entry_nick", &dialog->entry_nick,
                                       "togglebutton_refresh", &dialog->togglebutton_refresh,
                                       "vbox_browse", &dialog->vbox_browse,
                                       "image_status", &dialog->image_status,
@@ -184,7 +152,6 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
                              dialog,
                              "new_chatroom_dialog", "response", new_chatroom_dialog_response_cb,
                              "new_chatroom_dialog", "destroy", new_chatroom_dialog_destroy_cb,
-                             "entry_nick", "changed", new_chatroom_dialog_entry_changed_cb,
                              "entry_server", "changed", new_chatroom_dialog_entry_changed_cb,
                              "entry_server", "activate", new_chatroom_dialog_entry_server_activate_cb,
                              "entry_room", "changed", new_chatroom_dialog_entry_changed_cb,
@@ -201,34 +168,11 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
        gtk_size_group_add_widget (size_group, dialog->label_account);
        gtk_size_group_add_widget (size_group, dialog->label_server);
        gtk_size_group_add_widget (size_group, dialog->label_room);
-       gtk_size_group_add_widget (size_group, dialog->label_nick);
 
        g_object_unref (size_group);
 
-       /* Account chooser for custom */
-       dialog->account_chooser = empathy_account_chooser_new ();
-       gtk_box_pack_start (GTK_BOX (dialog->hbox_account),
-                           dialog->account_chooser,
-                           TRUE, TRUE, 0);
-       gtk_widget_show (dialog->account_chooser);
-
-       g_signal_connect (GTK_COMBO_BOX (dialog->account_chooser), "changed",
-                         G_CALLBACK (new_chatroom_dialog_account_changed_cb),
-                         dialog);
-
-       /* Populate */
-       accounts = mc_accounts_list ();
-       account_num = g_list_length (accounts);
-
-       g_list_foreach (accounts, (GFunc) g_object_unref, NULL);
-       g_list_free (accounts);
-
-       if (account_num > 1) {
-               gtk_widget_show (dialog->hbox_account);
-       } else {
-               /* Show no accounts combo box */
-               gtk_widget_hide (dialog->hbox_account);
-       }
+       /* Set up chatrooms treeview */
+       new_chatroom_dialog_model_setup (dialog);
 
        /* Add throbber */
        dialog->throbber = ephy_spinner_new ();
@@ -238,11 +182,21 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
        gtk_box_pack_start (GTK_BOX (dialog->hbox_status), dialog->throbber, 
                            FALSE, FALSE, 0);
 
-       /* Set up chatrooms treeview */
-       new_chatroom_dialog_model_setup (dialog);
+       /* Account chooser for custom */
+       dialog->account_chooser = empathy_account_chooser_new ();
+       empathy_account_chooser_set_filter (EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser),
+                                           empathy_account_chooser_filter_is_connected,
+                                           NULL);
+       gtk_table_attach_defaults (GTK_TABLE (dialog->table_info),
+                                  dialog->account_chooser,
+                                  1, 3, 0, 1);
+       gtk_widget_show (dialog->account_chooser);
 
-       /* Set things up according to the account type */
-       new_chatroom_dialog_update_widgets (dialog);
+       g_signal_connect (GTK_COMBO_BOX (dialog->account_chooser), "changed",
+                         G_CALLBACK (new_chatroom_dialog_account_changed_cb),
+                         dialog);
+       new_chatroom_dialog_account_changed_cb (GTK_COMBO_BOX (dialog->account_chooser),
+                                               dialog);
 
        if (parent) {
                gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
@@ -268,8 +222,10 @@ static void
 new_chatroom_dialog_destroy_cb (GtkWidget               *widget,
                                EmpathyNewChatroomDialog *dialog)
 {
+       if (dialog->room_list) {
+               g_object_unref (dialog->room_list);
+       }
        g_object_unref (dialog->model);  
-       g_object_unref (dialog->filter); 
 
        g_free (dialog);
 }
@@ -292,36 +248,19 @@ new_chatroom_dialog_model_setup (EmpathyNewChatroomDialog *dialog)
        store = gtk_list_store_new (COL_COUNT,
                                    G_TYPE_STRING,       /* Image */
                                    G_TYPE_STRING,       /* Text */
-                                   G_TYPE_POINTER);     /* infos */
+                                   G_TYPE_STRING);      /* Room */
 
        dialog->model = GTK_TREE_MODEL (store);
-
-       /* Filter */
-       dialog->filter = gtk_tree_model_filter_new (dialog->model, NULL);
-
-       gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter),
-                                               (GtkTreeModelFilterVisibleFunc)
-                                               new_chatroom_dialog_model_filter_func,
-                                               dialog,
-                                               NULL);
-
-       gtk_tree_view_set_model (view, dialog->filter);
-
-       g_signal_connect (dialog->filter, "row-inserted",
-                         G_CALLBACK (new_chatroom_dialog_model_row_inserted_cb),
-                         dialog);
-       g_signal_connect (dialog->filter, "row-deleted",
-                         G_CALLBACK (new_chatroom_dialog_model_row_deleted_cb),
-                         dialog);
+       gtk_tree_view_set_model (view, dialog->model);
 
        /* Selection */
        selection = gtk_tree_view_get_selection (view);
-       gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
                                              COL_NAME, GTK_SORT_ASCENDING);
 
        g_signal_connect (selection, "changed",
-                         G_CALLBACK (new_chatroom_dialog_model_selection_changed), dialog);
+                         G_CALLBACK (new_chatroom_dialog_model_selection_changed),
+                         dialog);
 
        /* Columns */
        new_chatroom_dialog_model_add_columns (dialog);
@@ -337,13 +276,6 @@ new_chatroom_dialog_model_add_columns (EmpathyNewChatroomDialog *dialog)
        view = GTK_TREE_VIEW (dialog->treeview);
        gtk_tree_view_set_headers_visible (view, FALSE);
 
-       /* Chatroom pointer */
-       column = gtk_tree_view_column_new ();
-       gtk_tree_view_column_set_title (column, _("Chat Rooms"));
-
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (column, cell, FALSE);
-
        cell = gtk_cell_renderer_text_new ();
        g_object_set (cell,
                      "xpad", (guint) 4,
@@ -351,103 +283,51 @@ new_chatroom_dialog_model_add_columns (EmpathyNewChatroomDialog *dialog)
                      "ellipsize", PANGO_ELLIPSIZE_END,
                      NULL);
 
-       gtk_tree_view_column_pack_start (column, cell, TRUE);
+       column = gtk_tree_view_column_new_with_attributes (_("Chat Rooms"),
+                                                          cell,
+                                                          "text", COL_NAME,
+                                                          NULL);
 
        gtk_tree_view_column_set_expand (column, TRUE);
        gtk_tree_view_append_column (view, column);
 }
 
-static void
-new_chatroom_dialog_update_buttons (EmpathyNewChatroomDialog *dialog)
-{
-       GtkButton            *button;
-       GtkWidget            *image;
-       GtkTreeView          *view;
-       GtkTreeModel         *model;
-       guint                 items;
-       const gchar          *room;
-
-       /* Sort out Join button. */
-       button = GTK_BUTTON (dialog->button_join);
-       
-       image = gtk_button_get_image (button);
-       if (!image) {
-               image = gtk_image_new ();
-               gtk_button_set_image (button, image);
-       }
-       //gtk_button_set_use_stock (button, FALSE);
-
-       room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
-
-       /* Collect necessary information first. */
-       view = GTK_TREE_VIEW (dialog->treeview);
-       model = gtk_tree_view_get_model (view);
-       items = gtk_tree_model_iter_n_children (model, NULL);
-               
-       if (items < 1 && !G_STR_EMPTY (room)) {
-               gtk_button_set_label (button, _("Create"));
-               gtk_image_set_from_stock (GTK_IMAGE (image),
-                                         GTK_STOCK_NEW,
-                                         GTK_ICON_SIZE_BUTTON);
-       } else {
-               gtk_button_set_label (button, _("Join"));
-               gtk_image_set_from_stock (GTK_IMAGE (image),
-                                         GTK_STOCK_EXECUTE,
-                                         GTK_ICON_SIZE_BUTTON);
-       }
-
-       gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room));
-}
-
 static void
 new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog)
 {
        EmpathyAccountChooser *account_chooser;
-       McAccount            *account;
-       McProfile            *profile;
-       const gchar          *protocol;
+       McAccount             *account;
+       McProfile             *profile;
+       const gchar           *protocol;
+       const gchar           *room;
        
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
        account = empathy_account_chooser_get_account (account_chooser);
        profile = mc_account_get_profile (account);
        protocol = mc_profile_get_protocol_name (profile);
 
+       gtk_entry_set_text (GTK_ENTRY (dialog->entry_server), "");
+
        /* hardcode here known protocols */
        if (strcmp (protocol, "jabber") == 0) {
-               const gchar *server;
-
-               server = mc_profile_get_default_account_domain (profile);
-               if (server) {
-                       gchar *conference_server;
-
-                       conference_server = g_strconcat ("conference.",
-                                                        server, NULL);
-                       gtk_entry_set_text (GTK_ENTRY (dialog->entry_server),
-                                                      conference_server);
-                       g_free (conference_server);
-               }
-
-               gtk_widget_show (dialog->hbox_server);
-               gtk_widget_show (dialog->hbox_nick);
+               gtk_widget_set_sensitive (dialog->entry_server, TRUE);
                gtk_widget_show (dialog->vbox_browse);
 
        }
-       else if (strcmp (protocol, "salut") == 0) {
-               gtk_widget_hide (dialog->hbox_server);
-               gtk_widget_show (dialog->hbox_nick);
+       else if (strcmp (protocol, "local-xmpp") == 0) {
+               gtk_widget_set_sensitive (dialog->entry_server, FALSE);
                gtk_widget_show (dialog->vbox_browse);          
        }
        else if (strcmp (protocol, "irc") == 0) {
-               gtk_widget_hide (dialog->hbox_server);
-               gtk_widget_hide (dialog->hbox_nick);
+               gtk_widget_set_sensitive (dialog->entry_server, FALSE);
                gtk_widget_show (dialog->vbox_browse);          
        } else {
-               gtk_widget_hide (dialog->hbox_server);
-               gtk_widget_hide (dialog->hbox_nick);
-               gtk_widget_hide (dialog->vbox_browse);
+               gtk_widget_set_sensitive (dialog->entry_server, TRUE);
+               gtk_widget_show (dialog->vbox_browse);
        }
 
-       new_chatroom_dialog_update_buttons (dialog);
+       room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
+       gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room));
 
        /* Final set up of the dialog */
        gtk_widget_grab_focus (dialog->entry_room);
@@ -460,105 +340,105 @@ static void
 new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
                                        EmpathyNewChatroomDialog *dialog)
 {
+       EmpathyAccountChooser *account_chooser;
+       McAccount             *account;
+       gboolean               listing = FALSE;
+
+       if (dialog->room_list) {
+               g_object_unref (dialog->room_list);
+       }
+
+       ephy_spinner_stop (EPHY_SPINNER (dialog->throbber));
+       new_chatroom_dialog_model_clear (dialog);
+
+       account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
+       account = empathy_account_chooser_get_account (account_chooser);
+       dialog->room_list = empathy_tp_roomlist_new (account);
+
+       if (dialog->room_list)  {
+               g_signal_connect (dialog->room_list, "destroy",
+                                 G_CALLBACK (new_chatroom_dialog_roomlist_destroy_cb),
+                                 dialog);
+               g_signal_connect (dialog->room_list, "new-room",
+                                 G_CALLBACK (new_chatroom_dialog_new_room_cb),
+                                 dialog);
+               g_signal_connect (dialog->room_list, "listing",
+                                 G_CALLBACK (new_chatroom_dialog_listing_cb),
+                                 dialog);
+
+               listing = empathy_tp_roomlist_is_listing (dialog->room_list);
+               if (listing) {
+                       ephy_spinner_start (EPHY_SPINNER (dialog->throbber));
+               }
+       }
+
        new_chatroom_dialog_update_widgets (dialog);
 }
 
 static void
-new_chatroom_dialog_model_add (EmpathyNewChatroomDialog *dialog,
-                              EmpathyRoomListItem     *item)
+new_chatroom_dialog_roomlist_destroy_cb (EmpathyTpRoomlist        *room_list,
+                                        EmpathyNewChatroomDialog *dialog)
+{
+       g_object_unref (dialog->room_list);
+       dialog->room_list = NULL;
+}
+
+static void
+new_chatroom_dialog_new_room_cb (EmpathyTpRoomlist        *room_list,
+                                EmpathyChatroom          *chatroom,
+                                EmpathyNewChatroomDialog *dialog)
 {
        GtkTreeView      *view;
        GtkTreeSelection *selection;
        GtkListStore     *store;
        GtkTreeIter       iter;
 
+       empathy_debug (DEBUG_DOMAIN, "New chatroom listed: %s (%s)",
+                      empathy_chatroom_get_name (chatroom),
+                      empathy_chatroom_get_room (chatroom));
+
        /* Add to model */
        view = GTK_TREE_VIEW (dialog->treeview);
        selection = gtk_tree_view_get_selection (view);
        store = GTK_LIST_STORE (dialog->model);
 
        gtk_list_store_append (store, &iter);
-
        gtk_list_store_set (store, &iter,
-                           COL_NAME, item->name,
-                           COL_POINTER, item,
+                           COL_NAME, empathy_chatroom_get_name (chatroom),
+                           COL_ROOM, empathy_chatroom_get_room (chatroom),
                            -1);
 }
 
 static void
-new_chatroom_dialog_model_clear (EmpathyNewChatroomDialog *dialog)
-{
-       GtkListStore *store;
-
-       store = GTK_LIST_STORE (dialog->model);
-       gtk_list_store_clear (store);
-}
-
-static GList *
-new_chatroom_dialog_model_get_selected (EmpathyNewChatroomDialog *dialog)
+new_chatroom_dialog_listing_cb (EmpathyTpRoomlist        *room_list,
+                               gboolean                  listing,
+                               EmpathyNewChatroomDialog *dialog)
 {
-       GtkTreeView      *view;
-       GtkTreeModel     *model;
-       GtkTreeSelection *selection;
-       GList            *rows, *l;
-       GList            *chatrooms = NULL;
-
-       view = GTK_TREE_VIEW (dialog->treeview);
-       selection = gtk_tree_view_get_selection (view);
-       model = gtk_tree_view_get_model (view);
-
-       rows = gtk_tree_selection_get_selected_rows (selection, NULL);
-       for (l = rows; l; l = l->next) {
-               GtkTreeIter          iter;
-               EmpathyRoomListItem *chatroom;
-
-               if (!gtk_tree_model_get_iter (model, &iter, l->data)) {
-                       continue;
-               }
-
-               gtk_tree_model_get (model, &iter, COL_POINTER, &chatroom, -1);
-               chatrooms = g_list_append (chatrooms, chatroom);
+       /* Update the throbber */
+       if (listing) {
+               ephy_spinner_start (EPHY_SPINNER (dialog->throbber));           
+       } else {
+               ephy_spinner_stop (EPHY_SPINNER (dialog->throbber));
        }
 
-       g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
-       g_list_free (rows);
-
-       return chatrooms;
+       /* Update the refresh toggle button */
+       g_signal_handlers_block_by_func (dialog->togglebutton_refresh,
+                                        new_chatroom_dialog_togglebutton_refresh_toggled_cb,
+                                        dialog);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->togglebutton_refresh),
+                                     listing);
+       g_signal_handlers_unblock_by_func (dialog->togglebutton_refresh,
+                                          new_chatroom_dialog_togglebutton_refresh_toggled_cb,
+                                          dialog);
 }
 
-static gboolean
-new_chatroom_dialog_model_filter_func (GtkTreeModel            *model,
-                                      GtkTreeIter             *iter,
-                                      EmpathyNewChatroomDialog *dialog)
+static void
+new_chatroom_dialog_model_clear (EmpathyNewChatroomDialog *dialog)
 {
-       EmpathyRoomListItem *chatroom;
-       const gchar         *text;
-       gchar               *room_nocase;
-       gchar               *text_nocase;
-       gboolean             found = FALSE;
-
-       gtk_tree_model_get (model, iter, COL_POINTER, &chatroom, -1);
-
-       if (!chatroom) {
-               return TRUE;
-       }
-
-       text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
-
-       /* Casefold */
-       room_nocase = g_utf8_casefold (chatroom->id, -1);
-       text_nocase = g_utf8_casefold (text, -1);
-
-       /* Compare */
-       if (g_utf8_strlen (text_nocase, -1) < 1 ||
-           strstr (room_nocase, text_nocase)) {
-               found = TRUE;
-       }
-
-       g_free (room_nocase);
-       g_free (text_nocase);
+       GtkListStore *store;
 
-       return found;
+       store = GTK_LIST_STORE (dialog->model);
+       gtk_list_store_clear (store);
 }
 
 static void
@@ -571,27 +451,29 @@ new_chatroom_dialog_model_row_activated_cb (GtkTreeView             *tree_view,
 }
 
 static void
-new_chatroom_dialog_model_row_inserted_cb (GtkTreeModel            *model,
-                                          GtkTreePath             *path,
-                                          GtkTreeIter             *iter,
-                                          EmpathyNewChatroomDialog *dialog)
-{
-       new_chatroom_dialog_update_buttons (dialog);
-}
+new_chatroom_dialog_model_selection_changed (GtkTreeSelection         *selection,
+                                            EmpathyNewChatroomDialog *dialog)
+{      
+       GtkTreeModel *model;
+       GtkTreeIter   iter;
+       gchar        *room = NULL;
+       gchar        *server = NULL;
 
-static void
-new_chatroom_dialog_model_row_deleted_cb (GtkTreeModel            *model,
-                                         GtkTreePath             *path,
-                                         EmpathyNewChatroomDialog *dialog)
-{
-       new_chatroom_dialog_update_buttons (dialog);
-}
+       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
+               return;
+       }
 
-static void
-new_chatroom_dialog_model_selection_changed (GtkTreeSelection      *selection,
-                                            EmpathyNewChatroomDialog *dialog)
-{
-       new_chatroom_dialog_update_buttons (dialog);
+       gtk_tree_model_get (model, &iter, COL_ROOM, &room, -1);
+       server = strstr (room, "@");
+       if (server) {
+               *server = '\0';
+               server++;
+       }
+
+       gtk_entry_set_text (GTK_ENTRY (dialog->entry_server), server ? server : "");
+       gtk_entry_set_text (GTK_ENTRY (dialog->entry_room), room ? room : "");
+
+       g_free (room);
 }
 
 static void
@@ -600,24 +482,13 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog)
        McAccount            *account;
        EmpathyAccountChooser *account_chooser;
        MissionControl       *mc;
-       GList                *chatrooms, *l;
        const gchar          *room;
        const gchar          *server = NULL;
        gchar                *room_name = NULL;
 
-       chatrooms = new_chatroom_dialog_model_get_selected (dialog);
-       if (chatrooms) {
-               for (l = chatrooms; l; l = l->next) {
-                       /* Join it */
-               }
-               g_list_free (chatrooms);
-               return;
-       }
-
        room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
-       if (GTK_WIDGET_VISIBLE (dialog->hbox_server)) {
-               server = gtk_entry_get_text (GTK_ENTRY (dialog->entry_server));
-       }
+       server = gtk_entry_get_text (GTK_ENTRY (dialog->entry_server));
+
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
        account = empathy_account_chooser_get_account (account_chooser);
 
@@ -641,28 +512,33 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog)
 }
 
 static void
-new_chatroom_dialog_entry_changed_cb (GtkWidget               *entry,
+new_chatroom_dialog_entry_changed_cb (GtkWidget                *entry,
                                      EmpathyNewChatroomDialog *dialog)
 {
        if (entry == dialog->entry_room) {
-               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (dialog->filter));
-       } 
+               const gchar *room;
 
-       new_chatroom_dialog_update_buttons (dialog);
+               room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
+               gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room));
+               /* FIXME: Select the room in the list */
+       }
 }
 
 static void
 new_chatroom_dialog_browse_start (EmpathyNewChatroomDialog *dialog)
 {
-       if (0) {
-               new_chatroom_dialog_model_clear (dialog);
-               new_chatroom_dialog_model_add (dialog, NULL);
+       new_chatroom_dialog_model_clear (dialog);
+       if (dialog->room_list) {
+               empathy_tp_roomlist_start (dialog->room_list);
        }
 }
 
 static void
 new_chatroom_dialog_browse_stop (EmpathyNewChatroomDialog *dialog)
 {
+       if (dialog->room_list) {
+               empathy_tp_roomlist_stop (dialog->room_list);
+       }
 }
 
 static void