update gnome-contacts's desktop file

[empathy.git] / src / empathy-chatrooms-window.c

diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 1ebe80bd2a28694414063c61a2bd22f99696e8c6..25c7814f6e42f62c98d62fe2376d830a44fec397 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -23,23 +23,16 @@
  *          Mikael Hallendal <micke@imendio.com>
  */
 
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
+#include "config.h"
+#include "empathy-chatrooms-window.h"
 
-#include <gtk/gtk.h>
-#include <glib.h>
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-chatrooms-window.h"
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-account-chooser.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 typedef struct {
        EmpathyChatroomManager *manager;
@@ -108,16 +101,16 @@ empathy_chatrooms_window_show (GtkWindow *parent)
        window = g_new0 (EmpathyChatroomsWindow, 1);
 
        filename = empathy_file_lookup ("empathy-chatrooms-window.ui", "src");
-       gui = empathy_builder_get_file (filename,
-                                      "chatrooms_window", &window->window,
-                                      "hbox_account", &window->hbox_account,
-                                      "label_account", &window->label_account,
-                                      "sw_room_list", &sw,
-                                      "treeview", &window->treeview,
-                                      "toolbar_remove", &toolbar,
-                                      "button_remove", &window->button_remove,
-                                      "button_close", &window->button_close,
-                                      NULL);
+       gui = tpaw_builder_get_file (filename,
+                                    "chatrooms_window", &window->window,
+                                    "hbox_account", &window->hbox_account,
+                                    "label_account", &window->label_account,
+                                    "sw_room_list", &sw,
+                                    "treeview", &window->treeview,
+                                    "toolbar_remove", &toolbar,
+                                    "button_remove", &window->button_remove,
+                                    "button_close", &window->button_close,
+                                    NULL);
        g_free (filename);
 
        /* join the remove toolbar to the treeview */
@@ -126,7 +119,7 @@ empathy_chatrooms_window_show (GtkWindow *parent)
        context = gtk_widget_get_style_context (toolbar);
        gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
 
-       empathy_builder_connect (gui, window,
+       tpaw_builder_connect (gui, window,
                              "chatrooms_window", "destroy", chatrooms_window_destroy_cb,
                              "button_remove", "clicked", chatrooms_window_button_remove_clicked_cb,
                              "button_close", "clicked", chatrooms_window_button_close_clicked_cb,
@@ -348,8 +341,7 @@ chatrooms_window_model_add (EmpathyChatroomsWindow *window,
        model = gtk_tree_view_get_model (view);
        store = GTK_LIST_STORE (model);
 
-       gtk_list_store_append (store, &iter);
-       gtk_list_store_set (store, &iter,
+       gtk_list_store_insert_with_values (store, &iter, -1,
                            COL_NAME, empathy_chatroom_get_name (chatroom),
                            COL_ROOM, empathy_chatroom_get_room (chatroom),
                            COL_AUTO_CONNECT, empathy_chatroom_get_auto_connect (chatroom),