From 1bd3678dbeb2a9b1094e346ef0164ba8b35151cd Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Fri, 18 Apr 2003 17:46:26 +0000 Subject: [ fixes #21499 ] 2003-04-18 Rodney Dawes [ 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 --- my-evolution/ChangeLog | 8 ++++++++ my-evolution/Makefile.am | 1 + my-evolution/e-summary-factory.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'my-evolution') diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 40cd9561e1..697a12108a 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,11 @@ +2003-04-18 Rodney Dawes + + [#21499] + + * Makefile.am: + * e-summary-factory.c: + Use PREFIX instead of EVOLUTION_DATADIR for bonobo_ui_util_set_ui () + 2003-04-16 Ettore Perazzoli [#39693] diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index fcb3e124b4..f255497090 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ -DLOCATIONDIR=\""$(Locationdir)"\" \ + -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ $(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS) diff --git a/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c index 521ebc3120..43f7fe5467 100644 --- a/my-evolution/e-summary-factory.c +++ b/my-evolution/e-summary-factory.c @@ -64,7 +64,7 @@ control_activate (BonoboControl *control, bonobo_ui_component_add_verb_list_with_data (ui_component, summary_verbs, summary); bonobo_ui_component_freeze (ui_component, NULL); - bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (ui_component, PREFIX, EVOLUTION_UIDIR "/my-evolution.xml", "my-evolution", NULL); e_pixmaps_update (ui_component, pixmaps); -- cgit v1.2.3