From cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 22 Jan 2003 20:11:58 +0000 Subject: 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 --- mail/component-factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index 353d0026f2..9a2a5e2089 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -799,7 +799,7 @@ owner_set_cb (EvolutionShellComponent *shell_component, { /* setup the global quick-search context */ char *user = g_strdup_printf ("%s/searches.xml", evolution_dir); - char *system = g_strdup (EVOLUTION_DATADIR "/evolution/vfoldertypes.xml"); + char *system = g_strdup (EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml"); search_context = rule_context_new (); g_object_set_data_full(G_OBJECT(search_context), "user", user, g_free); -- cgit v1.2.3