Always display the 'Room' column (#586678)

There is no reason to only display it when an account is selected.

diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 6f2c8c24c46e29c5b93eec927ca5934b5a027c6d..aae8aac3234588659fcc7ae562daad1eddd6c8ca 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -52,8 +52,6 @@ typedef struct {
        GtkWidget             *button_remove;
        GtkWidget             *button_edit;
        GtkWidget             *button_close;
-
-       gint                   room_column;
 } EmpathyChatroomsWindow;
 
 static void             chatrooms_window_destroy_cb                      (GtkWidget             *widget,
@@ -278,7 +276,6 @@ chatrooms_window_model_add_columns (EmpathyChatroomsWindow *window)
                                                           NULL);
        count = gtk_tree_view_append_column (view, column);
        gtk_tree_view_column_set_sort_column_id (column, count - 1);
-       window->room_column = count - 1;
 
        /* Chatroom auto connect */
        cell = gtk_cell_renderer_toggle_new ();
@@ -306,7 +303,6 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window,
        GtkTreeModel          *model;
        GtkListStore          *store;
        GtkTreeIter            iter;
-       GtkTreeViewColumn     *column;
        EmpathyAccountChooser  *account_chooser;
        TpAccount             *account;
        GList                 *chatrooms, *l;
@@ -322,17 +318,6 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window,
 
        chatrooms = empathy_chatroom_manager_get_chatrooms (window->manager, account);
 
-       /* Sort out columns, we only show the server column for
-        * selected protocol types, such as Jabber.
-        */
-       if (account) {
-               column = gtk_tree_view_get_column (view, window->room_column);
-               gtk_tree_view_column_set_visible (column, TRUE);
-       } else {
-               column = gtk_tree_view_get_column (view, window->room_column);
-               gtk_tree_view_column_set_visible (column, FALSE);
-       }
-
        /* Clean out the store */
        gtk_list_store_clear (store);