diff options
| author | Rodney Dawes <dobey@ximian.com> | 2003-04-19 01:46:26 +0800 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2003-04-19 01:46:26 +0800 |
| commit | 1bd3678dbeb2a9b1094e346ef0164ba8b35151cd (patch) | |
| tree | f8cda95446c857c24d418d4a35d6edf470614949 /addressbook/gui/component | |
| parent | 3a26734567f7e76f76e31313744f504e8abbff15 (diff) | |
| download | gsoc2013-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 'addressbook/gui/component')
| -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 |
3 files changed, 3 insertions, 2 deletions
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); |