]> git.0d.be Git - empathy.git/blobdiff - src/empathy-chatrooms-window.c
projects / empathy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'sasl'
[empathy.git] / src / empathy-chatrooms-window.c
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index fa63d5a514e044ce7d1856eea124c888d16e453f..35e3e8b9d78b171c35f98b8d96d544a8aba110be 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  *          Martyn Russell <martyn@imendio.com>
@@ -50,10 +50,7 @@ typedef struct {
        GtkWidget             *account_chooser;
        GtkWidget             *treeview;
        GtkWidget             *button_remove;
-       GtkWidget             *button_edit;
        GtkWidget             *button_close;
-
-       gint                   room_column;
 } EmpathyChatroomsWindow;
 
 static void             chatrooms_window_destroy_cb                      (GtkWidget             *widget,
@@ -68,16 +65,8 @@ static void             chatrooms_window_model_add                       (Empath
 static void             chatrooms_window_model_cell_auto_connect_toggled (GtkCellRendererToggle  *cell,
                                                                          gchar                  *path_string,
                                                                          EmpathyChatroomsWindow  *window);
-static EmpathyChatroom * chatrooms_window_model_get_selected              (EmpathyChatroomsWindow *window);
-static void             chatrooms_window_model_action_selected           (EmpathyChatroomsWindow *window);
-static void             chatrooms_window_row_activated_cb                (GtkTreeView           *tree_view,
-                                                                         GtkTreePath           *path,
-                                                                         GtkTreeViewColumn     *column,
-                                                                         EmpathyChatroomsWindow *window);
 static void             chatrooms_window_button_remove_clicked_cb        (GtkWidget             *widget,
                                                                          EmpathyChatroomsWindow *window);
-static void             chatrooms_window_button_edit_clicked_cb          (GtkWidget             *widget,
-                                                                         EmpathyChatroomsWindow *window);
 static void             chatrooms_window_button_close_clicked_cb         (GtkWidget             *widget,
                                                                          EmpathyChatroomsWindow *window);
 static void             chatrooms_window_chatroom_added_cb               (EmpathyChatroomManager *manager,
@@ -122,7 +111,6 @@ empathy_chatrooms_window_show (GtkWindow *parent)
                                       "hbox_account", &window->hbox_account,
                                       "label_account", &window->label_account,
                                       "treeview", &window->treeview,
-                                      "button_edit", &window->button_edit,
                                       "button_remove", &window->button_remove,
                                       "button_close", &window->button_close,
                                       NULL);
@@ -131,7 +119,6 @@ empathy_chatrooms_window_show (GtkWindow *parent)
        empathy_builder_connect (gui, window,
                              "chatrooms_window", "destroy", chatrooms_window_destroy_cb,
                              "button_remove", "clicked", chatrooms_window_button_remove_clicked_cb,
-                             "button_edit", "clicked", chatrooms_window_button_edit_clicked_cb,
                              "button_close", "clicked", chatrooms_window_button_close_clicked_cb,
                              NULL);
 
@@ -154,7 +141,7 @@ empathy_chatrooms_window_show (GtkWindow *parent)
        empathy_account_chooser_set_filter (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser),
                                            empathy_account_chooser_filter_is_connected,
                                            NULL);
-       g_object_set (window->account_chooser, 
+       g_object_set (window->account_chooser,
                      "has-all-option", TRUE,
                      NULL);
        empathy_account_chooser_set_account (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser), NULL);
@@ -208,10 +195,6 @@ chatrooms_window_model_setup (EmpathyChatroomsWindow *window)
        /* View */
        view = GTK_TREE_VIEW (window->treeview);
 
-       g_signal_connect (view, "row-activated",
-                         G_CALLBACK (chatrooms_window_row_activated_cb),
-                         window);
-
        /* Store */
        store = gtk_list_store_new (COL_COUNT,
                                    G_TYPE_STRING,         /* Image */
@@ -222,7 +205,7 @@ chatrooms_window_model_setup (EmpathyChatroomsWindow *window)
 
        gtk_tree_view_set_model (view, GTK_TREE_MODEL (store));
 
-       /* Selection */ 
+       /* Selection */
        selection = gtk_tree_view_get_selection (view);
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 
@@ -273,12 +256,11 @@ chatrooms_window_model_add_columns (EmpathyChatroomsWindow *window)
 
        /* Room */
        cell = gtk_cell_renderer_text_new ();
-       column = gtk_tree_view_column_new_with_attributes (_("Room"), cell, 
-                                                          "text", COL_ROOM, 
+       column = gtk_tree_view_column_new_with_attributes (_("Room"), cell,
+                                                          "text", COL_ROOM,
                                                           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 ();
@@ -293,7 +275,7 @@ chatrooms_window_model_add_columns (EmpathyChatroomsWindow *window)
                          window);
 
        /* Sort model */
-       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), 0, 
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), 0,
                                              GTK_SORT_ASCENDING);
 }
 
@@ -306,9 +288,8 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window,
        GtkTreeModel          *model;
        GtkListStore          *store;
        GtkTreeIter            iter;
-       GtkTreeViewColumn     *column;
        EmpathyAccountChooser  *account_chooser;
-       McAccount             *account;
+       TpAccount             *account;
        GList                 *chatrooms, *l;
 
        view = GTK_TREE_VIEW (window->treeview);
@@ -322,17 +303,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);
 
@@ -415,46 +385,6 @@ chatrooms_window_model_cell_auto_connect_toggled (GtkCellRendererToggle  *cell,
        g_object_unref (chatroom);
 }
 
-static EmpathyChatroom *
-chatrooms_window_model_get_selected (EmpathyChatroomsWindow *window)
-{
-       GtkTreeView      *view;
-       GtkTreeModel     *model;
-       GtkTreeSelection *selection;
-       GtkTreeIter       iter;
-       EmpathyChatroom   *chatroom = NULL;
-
-       view = GTK_TREE_VIEW (window->treeview);
-       selection = gtk_tree_view_get_selection (view);
-
-       if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               gtk_tree_model_get (model, &iter, COL_POINTER, &chatroom, -1);
-       }
-
-       return chatroom;
-}
-
-static void
-chatrooms_window_model_action_selected (EmpathyChatroomsWindow *window)
-{
-       EmpathyChatroom *chatroom;
-
-       /* FIXME: This is still not implemented since Gossip fork */
-       chatroom = chatrooms_window_model_get_selected (window);
-       g_object_unref (chatroom);
-}
-
-static void
-chatrooms_window_row_activated_cb (GtkTreeView           *tree_view,
-                                  GtkTreePath           *path,
-                                  GtkTreeViewColumn     *column,
-                                  EmpathyChatroomsWindow *window)
-{
-       if (GTK_WIDGET_IS_SENSITIVE (window->button_edit)) {
-               chatrooms_window_model_action_selected (window);
-       }
-}
-
 static void
 chatrooms_window_button_remove_clicked_cb (GtkWidget             *widget,
                                           EmpathyChatroomsWindow *window)
@@ -482,17 +412,6 @@ chatrooms_window_button_remove_clicked_cb (GtkWidget             *widget,
        g_object_unref (chatroom);
 }
 
-static void
-chatrooms_window_button_edit_clicked_cb (GtkWidget             *widget,
-                                        EmpathyChatroomsWindow *window)
-{
-       EmpathyChatroom *chatroom;
-
-       /* FIXME: This is still not implemented since Gossip fork */
-       chatroom = chatrooms_window_model_get_selected (window);
-       g_object_unref (chatroom);
-}
-
 static void
 chatrooms_window_button_close_clicked_cb (GtkWidget             *widget,
                                          EmpathyChatroomsWindow *window)
@@ -506,7 +425,7 @@ chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager,
                                    EmpathyChatroomsWindow *window)
 {
        EmpathyAccountChooser *account_chooser;
-       McAccount            *account;
+       TpAccount             *account;
 
        account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);
        account = empathy_account_chooser_dup_account (account_chooser);
@@ -514,7 +433,7 @@ chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager,
        if (!account) {
                chatrooms_window_model_add (window, chatroom, FALSE);
        } else {
-               if (empathy_account_equal (account, empathy_chatroom_get_account (chatroom))) {
+               if (account == empathy_chatroom_get_account (chatroom)) {
                        chatrooms_window_model_add (window, chatroom, FALSE);
                }
 
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)