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

11 files changed, 43 insertions, 30 deletions

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 42bf35d76..53f6997d8 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -29,6 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <tp-account-widgets/tpaw-account-widget.h>
+#include <tp-account-widgets/tpaw-builder.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-accounts-common.h"
@@ -2283,7 +2284,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
 
   filename = empathy_file_lookup ("empathy-accounts-dialog.ui", "src");
 
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "accounts_dialog_hbox", &top_hbox,
       "vbox_details", &priv->vbox_details,
       "alignment_settings", &priv->alignment_settings,
@@ -2299,7 +2300,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, dialog,
+  tpaw_builder_connect (gui, dialog,
       "button_add", "clicked", accounts_dialog_button_add_clicked_cb,
       "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
       "button_import", "clicked", accounts_dialog_button_import_clicked_cb,
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index e6dca4868..5ecc123ad 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #include "empathy-call-window-fullscreen.h"
 
+#include <tp-account-widgets/tpaw-builder.h>
+
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
@@ -185,7 +187,7 @@ empathy_call_window_fullscreen_init (EmpathyCallWindowFullscreen *self)
   gchar *filename;
 
   filename = empathy_file_lookup ("empathy-call-window-fullscreen.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
     "leave_fullscreen_window", &priv->leave_fullscreen_popup,
     "leave_fullscreen_button", &self->leave_fullscreen_button,
     NULL);
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 03c9efb61..ed5de4ee7 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -25,6 +25,7 @@
 #include <telepathy-farstream/telepathy-farstream.h>
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
 #include "empathy-about-dialog.h"
 #include "empathy-audio-sink.h"
@@ -1622,7 +1623,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   priv->timer = g_timer_new ();
 
   filename = empathy_file_lookup ("empathy-call-window.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
     "call_window_vbox", &top_vbox,
     "errors_vbox", &priv->errors_vbox,
     "pane", &priv->pane,
@@ -1659,7 +1660,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
     NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
     "hangup", "clicked", empathy_call_window_hangup_cb,
     "audiocall", "clicked", empathy_call_window_audio_call_cb,
     "videocall", "clicked", empathy_call_window_video_call_cb,
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index b373b9c4e..5f23b6a47 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -29,6 +29,7 @@
 #include "empathy-chat-window.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
 #include "empathy-about-dialog.h"
 #include "empathy-chat-manager.h"
@@ -2411,7 +2412,7 @@ empathy_chat_window_init (EmpathyChatWindow *self)
     EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv);
 
   filename = empathy_file_lookup ("empathy-chat-window.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "chat_vbox", &chat_vbox,
       "ui_manager", &self->priv->ui_manager,
       "menu_conv_insert_smiley", &self->priv->menu_conv_insert_smiley,
@@ -2433,7 +2434,7 @@ empathy_chat_window_init (EmpathyChatWindow *self)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "menu_conv", "activate", chat_window_conv_activate_cb,
       "menu_conv_clear", "activate", chat_window_clear_activate_cb,
       "menu_conv_favorite", "toggled", chat_window_favorite_toggled_cb,
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,
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 18e05dc19..4321969d6 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -31,6 +31,7 @@
 #include "empathy-ft-manager.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
 #include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
@@ -970,7 +971,7 @@ ft_manager_build_ui (EmpathyFTManager *manager)
   EmpathyFTManagerPriv *priv = GET_PRIV (manager);
 
   filename = empathy_file_lookup ("empathy-ft-manager.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "ft_manager_dialog", &priv->window,
       "ft_list", &priv->treeview,
       "clear_button", &priv->clear_button,
@@ -979,14 +980,14 @@ ft_manager_build_ui (EmpathyFTManager *manager)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, manager,
+  tpaw_builder_connect (gui, manager,
       "ft_manager_dialog", "destroy", ft_manager_destroy_cb,
       "ft_manager_dialog", "response", ft_manager_response_cb,
       "ft_manager_dialog", "delete-event", ft_manager_delete_event_cb,
       "ft_manager_dialog", "key-press-event", ft_manager_key_press_event_cb,
       NULL);
 
-  empathy_builder_unref_and_keep_widget (gui, priv->window);
+  tpaw_builder_unref_and_keep_widget (gui, priv->window);
 
   /* Window geometry. */
   empathy_geometry_bind (GTK_WINDOW (priv->window), "ft-manager");
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 400a00629..42ffdd30b 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -26,6 +26,7 @@
 #include "empathy-import-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-ui-utils.h"
@@ -431,14 +432,14 @@ do_constructed (GObject *obj)
   gchar *filename;
 
   filename = empathy_file_lookup ("empathy-import-dialog.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "widget_vbox", &priv->vbox,
       "treeview", &priv->treeview,
       "scrolledwindow", &priv->scrolledwindow,
       NULL);
 
   g_free (filename);
-  empathy_builder_unref_and_keep_widget (gui, priv->vbox);
+  tpaw_builder_unref_and_keep_widget (gui, priv->vbox);
 
   g_signal_connect (priv->vbox, "destroy",
       G_CALLBACK (import_widget_destroy_cb), self);
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 5edf45a5a..ad44d2122 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -25,6 +25,7 @@
 #include "empathy-new-chatroom-dialog.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
 #include "empathy-account-chooser.h"
 #include "empathy-gsettings.h"
@@ -747,7 +748,7 @@ empathy_new_chatroom_dialog_init (EmpathyNewChatroomDialog *self)
       EMPATHY_TYPE_NEW_CHATROOM_DIALOG, EmpathyNewChatroomDialogPriv);
 
   filename = empathy_file_lookup ("empathy-new-chatroom-dialog.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "vbox_new_chatroom", &vbox,
       "table_grid", &self->priv->table_grid,
       "label_account", &self->priv->label_account,
@@ -763,7 +764,7 @@ empathy_new_chatroom_dialog_init (EmpathyNewChatroomDialog *self)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "entry_server", "changed", new_chatroom_dialog_entry_changed_cb,
       "entry_server", "activate", new_chatroom_dialog_entry_server_activate_cb,
       "entry_server", "focus-out-event",
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index b5e02b650..e37bc7475 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -27,6 +27,7 @@
 #include "empathy-preferences.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
 #include "empathy-client-factory.h"
 #include "empathy-gsettings.h"
@@ -1029,7 +1030,7 @@ empathy_preferences_init (EmpathyPreferences *preferences)
 	gtk_window_set_icon_name (GTK_WINDOW (preferences), "preferences-desktop");
 
 	filename = empathy_file_lookup ("empathy-preferences.ui", "src");
-	gui = empathy_builder_get_file (filename,
+	gui = tpaw_builder_get_file (filename,
 		"notebook", &priv->notebook,
 		"vbox_chat_theme", &priv->vbox_chat_theme,
 		"combobox_chat_theme", &priv->combobox_chat_theme,
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 1a30f7117..600d19610 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -26,6 +26,7 @@
 
 #include <sys/stat.h>
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
 #include "empathy-about-dialog.h"
 #include "empathy-accounts-dialog.h"
@@ -2245,7 +2246,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
 
   /* Set up interface */
   filename = empathy_file_lookup ("empathy-roster-window.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "main_vbox", &self->priv->main_vbox,
       "balance_vbox", &self->priv->balance_vbox,
       "errors_vbox", &self->priv->errors_vbox,
@@ -2290,7 +2291,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
   roster_window_setup_actions (self);
 
   filename = empathy_file_lookup ("empathy-roster-window-menubar.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "appmenu", &self->priv->menumodel,
       "rooms", &self->priv->rooms_section,
       NULL);
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 917fab383..e000f32e1 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -22,6 +22,8 @@
 #include "config.h"
 #include "empathy-status-icon.h"
 
+#include <tp-account-widgets/tpaw-builder.h>
+
 #include "empathy-event-manager.h"
 #include "empathy-gsettings.h"
 #include "empathy-new-call-dialog.h"
@@ -351,7 +353,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 	gchar                 *filename;
 
 	filename = empathy_file_lookup ("empathy-status-icon.ui", "src");
-	gui = empathy_builder_get_file (filename,
+	gui = tpaw_builder_get_file (filename,
 					"ui_manager", &priv->ui_manager,
 					"menu", &priv->popup_menu,
 					"show_list", &priv->show_window_item,
@@ -360,7 +362,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 				       NULL);
 	g_free (filename);
 
-	empathy_builder_connect (gui, icon,
+	tpaw_builder_connect (gui, icon,
 			      "show_list", "toggled", status_icon_show_hide_window_cb,
 			      "new_message", "activate", status_icon_new_message_cb,
 			      "new_call", "activate", status_icon_new_call_cb,