From 80cbfea2de458c7af824a0b22f6a6edbbd35b223 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 6 Feb 2003 23:25:31 +0000 Subject: (control_activate): Get evolution-executive-summary.xml from EVOLUTION_UI_DIRECTORY. svn path=/trunk/; revision=19836 --- executive-summary/ChangeLog | 5 +++++ executive-summary/component/Makefile.am | 2 +- executive-summary/component/e-summary-factory.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog index 3ab48d9509..fe9ebfed88 100644 --- a/executive-summary/ChangeLog +++ b/executive-summary/ChangeLog @@ -1,3 +1,8 @@ +2003-02-06 Ettore Perazzoli + + * component/e-summary-factory.c (control_activate): Get + evolution-executive-summary.xml from EVOLUTION_UI_DIRECTORY. + 2001-09-14 Ettore Perazzoli [Automake 1.5 fixes pointed out by Richard Boulton diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am index 870746bf1e..356665d777 100644 --- a/executive-summary/component/Makefile.am +++ b/executive-summary/component/Makefile.am @@ -66,7 +66,7 @@ evolution_executive_summary_LDADD = \ -lgal \ $(GTKHTML_LIBS) -gladedir = $(datadir)/evolution/glade +gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = executive-summary-config.glade if ENABLE_PURIFY diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c index 735074bcc3..42b666715d 100644 --- a/executive-summary/component/e-summary-factory.c +++ b/executive-summary/component/e-summary-factory.c @@ -79,7 +79,7 @@ control_activate (BonoboControl *control, bonobo_ui_component_freeze (ui_component, NULL); bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR, - "evolution-executive-summary.xml", + EVOLUTION_UI_DIRECTORY "/evolution-executive-summary.xml", "evolution-executive-summary"); e_pixmaps_update (ui_component, pixmaps); -- cgit v1.2.3