diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-05-09 22:50:15 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
| commit | 1f633bf20747995395b1dcc7001e0c9502104eda (patch) | |
| tree | 33eadea37c7a822d332d564ecc6a6e5e5d08db2b /src/empathy-chatrooms-window.c | |
| parent | eb7ddccaf6365f4ceb45d8a2ccd006e67e5dd340 (diff) | |
| download | gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.tar gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.tar.gz gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.tar.bz2 gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.tar.lz gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.tar.xz gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.tar.zst gsoc2013-empathy-1f633bf20747995395b1dcc7001e0c9502104eda.zip | |
builder: move empathy_builder_* from Empathy to tp-account-widgets
This commit also changes the licence of the moved code from GPL to LGPL.
See GOSSIP-RELICENSING.txt for details.
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'src/empathy-chatrooms-window.c')
| -rw-r--r-- | src/empathy-chatrooms-window.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index 553c91290..25c7814f6 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -27,6 +27,7 @@ #include "empathy-chatrooms-window.h" #include <glib/gi18n.h> +#include <tp-account-widgets/tpaw-builder.h> #include "empathy-account-chooser.h" #include "empathy-chatroom-manager.h" @@ -100,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 */ @@ -118,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, |