evolution r35483 - in branches/gnome-2-22/calendar: . gui/alarm-notify

[tml svn gnome org]

Author: tml
Date: Thu May  8 04:29:35 2008
New Revision: 35483
URL: http://svn.gnome.org/viewvc/evolution?rev=35483&view=rev

Log:
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.



Modified:
   branches/gnome-2-22/calendar/ChangeLog
   branches/gnome-2-22/calendar/gui/alarm-notify/alarm-notify-dialog.c

Modified: branches/gnome-2-22/calendar/gui/alarm-notify/alarm-notify-dialog.c
==============================================================================
--- branches/gnome-2-22/calendar/gui/alarm-notify/alarm-notify-dialog.c	(original)
+++ branches/gnome-2-22/calendar/gui/alarm-notify/alarm-notify-dialog.c	Thu May  8 04:29:35 2008
@@ -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 @@
 
 			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);