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 --- mail/ChangeLog | 9 +++++++++ mail/Makefile.am | 1 + mail/folder-browser-ui.c | 2 +- mail/mail-signature-editor.c | 2 +- mail/message-browser.c | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index ff438ae3cf..11fc64447e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2003-04-18 Rodney Dawes + + * 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. + 2003-04-17 Not Zed * mail-signature-editor.c (menu_help): remove the help menu item diff --git a/mail/Makefile.am b/mail/Makefile.am index 65d8c8bcc6..11be8be634 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -33,6 +33,7 @@ INCLUDES = \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \ + -DPREFIX=\""$(prefix)"\" \ -DG_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ -DG_LOG_DOMAIN=\"evolution-mail\" diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index 393278e505..2dbf4df3cf 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -312,7 +312,7 @@ ui_add (FolderBrowser *fb, const char *name, BonoboUIVerb verb[], EPixmap pixcac /*bonobo_ui_component_freeze (uic, NULL);*/ file = g_strconcat (EVOLUTION_UIDIR "/evolution-mail-", name, ".xml", NULL); - bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, file, "evolution-mail", NULL); + bonobo_ui_util_set_ui (uic, PREFIX, file, "evolution-mail", NULL); g_free (file); e_pixmaps_update (uic, pixcache); diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index 8d71636620..9a3a4e0272 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -391,7 +391,7 @@ mail_signature_editor (MailConfigSignature *sig, GtkWindow *parent, gboolean is_ component = bonobo_ui_component_new_default (); bonobo_ui_component_set_container (component, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL); bonobo_ui_component_add_verb_list_with_data (component, verbs, editor); - bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (component, PREFIX, EVOLUTION_UIDIR "/evolution-signature-editor.xml", "evolution-signature-editor", NULL); diff --git a/mail/message-browser.c b/mail/message-browser.c index bac9abb7d2..5c105bc109 100644 --- a/mail/message-browser.c +++ b/mail/message-browser.c @@ -283,7 +283,7 @@ set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb) /* Load our UI */ /*bonobo_ui_component_freeze (uic, NULL);*/ - bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (uic, PREFIX, EVOLUTION_UIDIR "/evolution-mail-messagedisplay.xml", "evolution-mail", NULL); -- cgit v1.2.3