aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-04-19 01:46:26 +0800
committerRodney Dawes <dobey@src.gnome.org>2003-04-19 01:46:26 +0800
commit1bd3678dbeb2a9b1094e346ef0164ba8b35151cd (patch)
treef8cda95446c857c24d418d4a35d6edf470614949 /calendar/gui
parent3a26734567f7e76f76e31313744f504e8abbff15 (diff)
downloadgsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.gz
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.bz2
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.lz
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.xz
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.tar.zst
gsoc2013-evolution-1bd3678dbeb2a9b1094e346ef0164ba8b35151cd.zip
[ fixes #21499 ]
2003-04-18 Rodney Dawes <dobey@ximian.com> [ fixes #21499 ] * gui/component/Makefile.am: * gui/component/addressbook.c: * gui/component/select-names/e-select-names-bonobo.c: * gui/contact-editor/Makefile.am: * gui/contact-editor/e-contact-editor.c: * gui/contact-list-editor/Makefile.am: * gui/contact-list-editor/e-contact-list-editor.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () * 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 () * Makefile.am: * e-msg-composer.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui (). Fixes bug #21499. * Makefile.am: * folder-browser-ui.c: * mail-signature-editor.c: * message-browser.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui (). Fixes bug #21499. * Makefile.am: * e-summary-factory.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () * e-shell-view.c: Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () [#21499] svn path=/trunk/; revision=20888
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/calendar-commands.c2
-rw-r--r--calendar/gui/dialogs/Makefile.am1
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
-rw-r--r--calendar/gui/tasks-control.c2
5 files changed, 5 insertions, 3 deletions
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);