aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-05-08 12:27:53 +0800
committerTor Lillqvist <tml@src.gnome.org>2008-05-08 12:27:53 +0800
commita2905483c8c14bf88b76f945134d90347a6a07b9 (patch)
treedc15ee4781d27a6b69071f91b8fcd2c01310d5ae
parent40d111e3ea48bc9d44dc5cb5a3f30f6b91bc9927 (diff)
downloadgsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.tar
gsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.tar.gz
gsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.tar.bz2
gsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.tar.lz
gsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.tar.xz
gsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.tar.zst
gsoc2013-evolution-a2905483c8c14bf88b76f945134d90347a6a07b9.zip
Include e-util-private.h for the mapping of EVOLUTION_GLADEDIR to a
2008-05-08 Tor Lillqvist <tml@novell.com> * gui/alarm-notify/alarm-notify-dialog.c: Include e-util-private.h for the mapping of EVOLUTION_GLADEDIR to a function call on Windows. Construct the glade file pathname at run-time so that it is found also on Windows where we don't use compile-time pathnames at run-time. svn path=/trunk/; revision=35482
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c11
2 files changed, 17 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 704dadd827..2866dea905 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-08 Tor Lillqvist <tml@novell.com>
+
+ * gui/alarm-notify/alarm-notify-dialog.c: Include e-util-private.h
+ for the mapping of EVOLUTION_GLADEDIR to a function call on
+ Windows. Construct the glade file pathname at run-time so that it
+ is found also on Windows where we don't use compile-time pathnames
+ at run-time.
+
2008-05-05 Johan Euphrosine <proppy@aminche.com>
* gui/migration.c: Fix include path for e-dbhash.h, now in libebackend.
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 982b859547..74583a8f7b 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -43,7 +43,8 @@
#include "alarm-notify-dialog.h"
#include "config-data.h"
#include "util.h"
-#include <e-util/e-icon-factory.h>
+#include "e-util/e-icon-factory.h"
+#include "e-util/e-util-private.h"
@@ -242,7 +243,13 @@ notified_alarms_dialog_new (void)
G_TYPE_POINTER /* FuncInfo*/));
- an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL, NULL);
+ char *gladefile;
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "alarm-notify.glade",
+ NULL);
+ an->xml = glade_xml_new (gladefile, NULL, NULL);
+ g_free (gladefile);
if (!an->xml) {
g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
g_free (an);