diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-bonobo.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.c | 2 |
8 files changed, 19 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b10833d890..54e2794f55 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +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 () + 2003-04-15 Chris Toshok <toshok@ximian.com> [ fixes #41252 ] diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 5a67f4d9d4..36dd543700 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -19,6 +19,7 @@ INCLUDES = \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DPREFIX=\""$(prefix)"\" \ $(LDAP_CFLAGS) \ -DG_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index b5f7bc5df8..39c4f2fcce 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -374,7 +374,7 @@ 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-addressbook.xml", "evolution-addressbook", NULL); diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c index 6c970a19fc..b722baec6f 100644 --- a/addressbook/gui/component/select-names/e-select-names-bonobo.c +++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c @@ -374,7 +374,7 @@ merge_menu_items (BonoboControl *control, BonoboUIComponent *uic, ControlUIClosu bonobo_ui_component_freeze (uic, NULL); - bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (uic, PREFIX, closure->ui_xml_path, closure->app_name, NULL); diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index e59d90cf50..c6738099b9 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \ + -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ -DG_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 3450c307aa..8de9ca4636 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1191,7 +1191,7 @@ create_ui (EContactEditor *ce) { bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce); - bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (ce->uic, PREFIX, EVOLUTION_UIDIR "/evolution-contact-editor.xml", "evolution-contact-editor", NULL); diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 1af8d7a86d..82e296f8cf 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \ + -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ -DG_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 754048c2a5..0ef87dc5a1 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -559,7 +559,7 @@ create_ui (EContactListEditor *ce) bonobo_ui_component_add_verb_list_with_data ( ce->uic, verbs, ce); - bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR, + bonobo_ui_util_set_ui (ce->uic, PREFIX, EVOLUTION_UIDIR "/evolution-contact-list-editor.xml", "evolution-contact-list-editor", NULL); |