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-autofilter.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-autofilter.c')
| -rw-r--r-- | mail/mail-autofilter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index 3916b33c55..c934bb44b0 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -314,7 +314,7 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag fc = filter_context_new (); user = g_strdup_printf ("%s/filters.xml", evolution_dir); - system = EVOLUTION_DATADIR "/evolution/filtertypes.xml"; + system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); rule = filter_rule_from_message (fc, msg, flags); @@ -335,7 +335,7 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri fc = filter_context_new (); user = g_strdup_printf ("%s/filters.xml", evolution_dir); - system = EVOLUTION_DATADIR "/evolution/filtertypes.xml"; + system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); changed = rule_context_rename_uri((RuleContext *)fc, olduri, newuri, uri_cmp); @@ -360,7 +360,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri) fc = filter_context_new (); user = g_strdup_printf ("%s/filters.xml", evolution_dir); - system = EVOLUTION_DATADIR "/evolution/filtertypes.xml"; + system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); deleted = rule_context_delete_uri ((RuleContext *) fc, uri, uri_cmp); |