aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/task-editor.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e50801f77e..94bcd9a8eb 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-08 Tor Lillqvist <tml@novell.com>
+
+ * gui/dialogs/task-editor.c (task_editor_init): Construct the
+ pathname to the xml file at run-time to avoid using compile-time
+ paths on Windows.
+
2006-01-09 Kjartan Maraas <kmaraas@gnome.org>
* gui/alarm-notify/alarm-notify-dialog.c:
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 32984a64b0..fab1a18351 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -32,6 +32,7 @@
#include <libgnome/gnome-i18n.h>
#include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
#include <evolution-shell-component-utils.h>
#include "task-page.h"
@@ -309,6 +310,7 @@ task_editor_init (TaskEditor *te)
TaskEditorPrivate *priv;
CompEditor *editor = COMP_EDITOR(te);
gboolean status;
+ char *xmlfile;
priv = g_new0 (TaskEditorPrivate, 1);
te->priv = priv;
@@ -322,9 +324,13 @@ task_editor_init (TaskEditor *te)
bonobo_ui_component_add_verb_list_with_data (editor->uic, verbs, te);
+ xmlfile = g_build_filename (EVOLUTION_UIDIR,
+ "evolution-task-editor.xml",
+ NULL);
bonobo_ui_util_set_ui (editor->uic, PREFIX,
- EVOLUTION_UIDIR "/evolution-task-editor.xml",
+ xmlfile,
"evolution-task-editor", NULL);
+ g_free (xmlfile);
/* Show hide the status fields */
status = calendar_config_get_show_status ();