diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:11:58 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:11:58 +0800 |
| commit | cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57 (patch) | |
| tree | c2a4b76233b03ca155b9aeb223df68edf56d1910 /mail/mail-vfolder.c | |
| parent | 61300d7b247a126e2370e11075589fec81349ae7 (diff) | |
| download | gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar.gz gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar.bz2 gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar.lz gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar.xz gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar.zst gsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.zip | |
Use EVOLUTION_GALVIEWSDIR.
* folder-browser-ui.c (folder_browser_ui_setup_view_menus): Use
EVOLUTION_GALVIEWSDIR.
* message-browser.c (set_bonobo_ui): Get
evolution-mail-messagedisplay.xml from EVOLUTION_UIDIR.
* mail-signature-editor.c (mail_signature_editor): Get
evolution-signature-editor.xml from EVOLUTION_UIDIR.
* folder-browser-ui.c (ui_add): Get the evoluiton-mail* XML files
from EVOLUTION_UIDIR.
* Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR; update
EVOLUTION_IMAGESDIR to include the $(BASE_VERSION).
(gladedir): Version using $(BASE_VERSION).
(etspecdir): Likewise.
(iconsdir): Likewise.
(buttonsdir): Likewise.
(etspecdir): Likewise.
* component-factory.c (owner_set_cb): Look for vfoldertypes.xml in
the new version-aware location.
* mail-summary.c (generate_folder_summaries): Likewise.
* mail-search-dialogue.c (mail_search_dialogue_construct): Likewise.
* mail-vfolder.c (vfolder_load_storage): Likewise.
* mail-autofilter.c (filter_gui_add_from_message): Look for
filtertypes.xml in the new version-aware location.
(mail_filter_rename_uri): Likewise.
(mail_filter_delete_uri): Likewise.
* mail-session.c (main_get_filter_driver): Likewise.
* mail-callbacks.c (filter_edit): Likewise.
svn path=/trunk/; revision=19562
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index ec1eee12d7..a64105b511 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -778,7 +778,8 @@ vfolder_load_storage(GNOME_Evolution_Shell shell) /* load our rules */ user = g_strdup_printf ("%s/vfolders.xml", evolution_dir); context = vfolder_context_new (); - if (rule_context_load ((RuleContext *)context, EVOLUTION_DATADIR "/evolution/vfoldertypes.xml", user) != 0) { + if (rule_context_load ((RuleContext *)context, + EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml", user) != 0) { g_warning("cannot load vfolders: %s\n", ((RuleContext *)context)->error); } g_free (user); |