diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 82015c65db..05f436b5cc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2006-01-04 Tor Lillqvist <tml@novell.com> + + * gui/dialogs/cal-prefs-dialog.c: Reinstate the run-time glade + file pathname lookup change from 2005-11-26. It had been + overwritten on 2005-12-19. + 2006-01-03 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #325416 diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index f88ecd89cd..a626ce8f1d 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -33,6 +33,7 @@ #include "cal-prefs-dialog.h" #include <widgets/misc/e-dateedit.h> #include <e-util/e-dialog-widgets.h> +#include <e-util/e-util-private.h> #include <libgnome/gnome-i18n.h> #include <string.h> @@ -497,8 +498,13 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs) "fri_button", "sat_button", }; + char *gladefile; - gui = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", "toplevel-notebook", NULL); + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "cal-prefs-dialog.glade", + NULL); + gui = glade_xml_new (gladefile, "toplevel-notebook", NULL); + g_free (gladefile); prefs->gui = gui; prefs->gconf = gconf_client_get_default (); |