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 /libempathy-gtk/empathy-chat.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 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 5bdc7ba1b..dd6208b48 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -34,6 +34,7 @@ #include <glib/gi18n-lib.h> #include <tp-account-widgets/tpaw-keyring.h> +#include <tp-account-widgets/tpaw-builder.h> #include "empathy-client-factory.h" #include "empathy-gsettings.h" @@ -3251,7 +3252,7 @@ chat_create_ui (EmpathyChat *chat) filename = empathy_file_lookup ("empathy-chat.ui", "libempathy-gtk"); - gui = empathy_builder_get_file (filename, + gui = tpaw_builder_get_file (filename, "chat_widget", &priv->widget, "hpaned", &priv->hpaned, "vbox_left", &priv->vbox_left, @@ -3264,7 +3265,7 @@ chat_create_ui (EmpathyChat *chat) "info_bar_vbox", &priv->info_bar_vbox, NULL); - empathy_builder_connect (gui, chat, + tpaw_builder_connect (gui, chat, "expander_topic", "notify::expanded", chat_topic_expander_activate_cb, "label_topic", "size-allocate", chat_topic_label_size_allocate_cb, NULL); |