diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | calendar/gui/calendar-commands.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 1 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 2 | ||||
| -rw-r--r-- | calendar/gui/tasks-control.c | 2 |
6 files changed, 16 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b7775328b2..b3a6f55e01 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2003-04-18 Rodney Dawes <dobey@ximian.com> + + Fixes #21499 + + * gui/Makefile.am: + * gui/calendar-commands.c: + * gui/tasks-control.c: + * gui/dialogs/Makefile.am: + * gui/dialogs/comp-editor.c: + Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () + 2003-04-17 JP Rosevear <jpr@ximian.com> Fixes #41459 diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 2b0e08e5b0..9c58cce4a7 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -79,6 +79,7 @@ INCLUDES = \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) glade_DATA = \ diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 854ded3825..23109d50a7 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -719,7 +719,7 @@ calendar_control_activate (BonoboControl *control, bonobo_ui_component_freeze (uic, NULL); - bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (uic, PREFIX, EVOLUTION_UIDIR "/evolution-calendar.xml", "evolution-calendar", NULL); diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 53ea88a9dc..8dc79e7fe7 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -28,6 +28,7 @@ INCLUDES = \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) noinst_LTLIBRARIES = libcal-dialogs.la diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index c8d89eae7e..a27ec7776c 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -198,7 +198,7 @@ setup_widgets (CompEditor *editor) "/evolution/UIConf/kvps"); bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor); - bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (priv->uic, PREFIX, EVOLUTION_UIDIR "/evolution-comp-editor.xml", "evolution-calendar", NULL); e_pixmaps_update (priv->uic, pixmaps); diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 41ff698fce..1e91b07afd 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -322,7 +322,7 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks) bonobo_ui_component_freeze (uic, NULL); - bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (uic, PREFIX, EVOLUTION_UIDIR "/evolution-tasks.xml", "evolution-tasks", NULL); |