aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-01-04 10:04:15 +0800
committerTor Lillqvist <tml@src.gnome.org>2006-01-04 10:04:15 +0800
commit3ee258c7561792a7a9b999751ec99288ace2a3b4 (patch)
treedbcfba83c0b2f4e5ddd2326d280f594e6fd7ed40 /calendar
parent08642cd462600ba6113bb00443a67d0b45462f49 (diff)
downloadgsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.tar
gsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.tar.gz
gsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.tar.bz2
gsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.tar.lz
gsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.tar.xz
gsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.tar.zst
gsoc2013-evolution-3ee258c7561792a7a9b999751ec99288ace2a3b4.zip
Reinstate the run-time glade file pathname lookup change from 2005-11-26.
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. svn path=/trunk/; revision=31042
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c8
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 ();