diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-17 06:10:34 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-17 06:10:34 +0800 |
| commit | f369aa1633fd6d1c02680e97006bc53e4b8e44eb (patch) | |
| tree | c78ac2dceb543b6d989f96f693c861c5a612ec41 /libempathy-gtk/empathy-account-widget.c | |
| parent | 841b4512d41749ea2229f1ceb6ec7b77f9c78e81 (diff) | |
| download | gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.tar gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.tar.gz gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.tar.bz2 gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.tar.lz gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.tar.xz gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.tar.zst gsoc2013-empathy-f369aa1633fd6d1c02680e97006bc53e4b8e44eb.zip | |
Use empathy_file_lookup for glade files since some are in libempathy-gtk/ and others in src/
svn path=/trunk/; revision=813
Diffstat (limited to 'libempathy-gtk/empathy-account-widget.c')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index a8373cb66..1519a2f5a 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -33,6 +33,7 @@ #include <libmissioncontrol/mc-protocol.h> #include <libempathy/empathy-debug.h> +#include <libempathy/empathy-utils.h> #include "empathy-account-widget.h" #include "empathy-ui-utils.h" @@ -446,16 +447,20 @@ empathy_account_widget_generic_new (McAccount *account) GtkWidget *widget; GtkWidget *table_common_settings; GtkWidget *table_advanced_settings; + gchar *filename; g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - glade = empathy_glade_get_file ("empathy-account-widget-generic.glade", + filename = empathy_file_lookup ("empathy-account-widget-generic.glade", + "libempathy-gtk"); + glade = empathy_glade_get_file (filename, "vbox_generic_settings", NULL, "vbox_generic_settings", &widget, "table_common_settings", &table_common_settings, "table_advanced_settings", &table_advanced_settings, NULL); + g_free (filename); accounts_widget_generic_setup (account, table_common_settings, table_advanced_settings); @@ -471,12 +476,16 @@ empathy_account_widget_salut_new (McAccount *account) { GladeXML *glade; GtkWidget *widget; + gchar *filename; - glade = empathy_glade_get_file ("empathy-account-widget-salut.glade", + filename = empathy_file_lookup ("empathy-account-widget-salut.glade", + "libempathy-gtk"); + glade = empathy_glade_get_file (filename, "vbox_salut_settings", NULL, "vbox_salut_settings", &widget, NULL); + g_free (filename); empathy_account_widget_handle_params (account, glade, "entry_published", "published-name", @@ -499,12 +508,16 @@ empathy_account_widget_msn_new (McAccount *account) { GladeXML *glade; GtkWidget *widget; + gchar *filename; - glade = empathy_glade_get_file ("empathy-account-widget-msn.glade", + filename = empathy_file_lookup ("empathy-account-widget-msn.glade", + "libempathy-gtk"); + glade = empathy_glade_get_file (filename, "vbox_msn_settings", NULL, "vbox_msn_settings", &widget, NULL); + g_free (filename); empathy_account_widget_handle_params (account, glade, "entry_id", "account", @@ -531,14 +544,18 @@ empathy_account_widget_jabber_new (McAccount *account) GtkWidget *widget; GtkWidget *spinbutton_port; GtkWidget *checkbutton_ssl; + gchar *filename; - glade = empathy_glade_get_file ("empathy-account-widget-jabber.glade", + filename = empathy_file_lookup ("empathy-account-widget-jabber.glade", + "libempathy-gtk"); + glade = empathy_glade_get_file (filename, "vbox_jabber_settings", NULL, "vbox_jabber_settings", &widget, "spinbutton_port", &spinbutton_port, "checkbutton_ssl", &checkbutton_ssl, NULL); + g_free (filename); empathy_account_widget_handle_params (account, glade, "entry_id", "account", @@ -573,13 +590,17 @@ empathy_account_widget_icq_new (McAccount *account) GladeXML *glade; GtkWidget *widget; GtkWidget *spinbutton_port; + gchar *filename; - glade = empathy_glade_get_file ("empathy-account-widget-icq.glade", + filename = empathy_file_lookup ("empathy-account-widget-icq.glade", + "libempathy-gtk"); + glade = empathy_glade_get_file (filename, "vbox_icq_settings", NULL, "vbox_icq_settings", &widget, "spinbutton_port", &spinbutton_port, NULL); + g_free (filename); empathy_account_widget_handle_params (account, glade, "entry_uin", "account", @@ -605,12 +626,16 @@ empathy_account_widget_yahoo_new (McAccount *account) { GladeXML *glade; GtkWidget *widget; + gchar *filename; - glade = empathy_glade_get_file ("empathy-account-widget-yahoo.glade", + filename = empathy_file_lookup ("empathy-account-widget-yahoo.glade", + "libempathy-gtk"); + glade = empathy_glade_get_file (filename, "vbox_yahoo_settings", NULL, "vbox_yahoo_settings", &widget, NULL); + g_free (filename); empathy_account_widget_handle_params (account, glade, "entry_id", "account", |