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-roster-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-roster-window.c')
| -rw-r--r-- | src/empathy-roster-window.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |