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 /src/empathy-preferences.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 'src/empathy-preferences.c')
-rw-r--r-- | src/empathy-preferences.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 1304c58ef..4d3fe1784 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -30,6 +30,8 @@ #include <glade/glade.h> #include <glib/gi18n.h> +#include <libempathy/empathy-utils.h> + #include <libempathy-gtk/empathy-conf.h> #include <libempathy-gtk/empathy-ui-utils.h> #include <libempathy-gtk/empathy-theme-manager.h> @@ -951,6 +953,7 @@ empathy_preferences_show (GtkWindow *parent) { static EmpathyPreferences *preferences; GladeXML *glade; + gchar *filename; if (preferences) { gtk_window_present (GTK_WINDOW (preferences->dialog)); @@ -959,8 +962,8 @@ empathy_preferences_show (GtkWindow *parent) preferences = g_new0 (EmpathyPreferences, 1); - glade = empathy_glade_get_file ( - "empathy-preferences.glade", + filename = empathy_file_lookup ("empathy-preferences.glade", "src"); + glade = empathy_glade_get_file (filename, "preferences_dialog", NULL, "preferences_dialog", &preferences->dialog, @@ -980,6 +983,7 @@ empathy_preferences_show (GtkWindow *parent) "checkbutton_popups_when_available", &preferences->checkbutton_popups_when_available, "treeview_spell_checker", &preferences->treeview_spell_checker, NULL); + g_free (filename); empathy_glade_connect (glade, preferences, |