aboutsummaryrefslogtreecommitdiffstats
path: root/mail/folder-browser-ui.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-01-23 04:11:58 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-01-23 04:11:58 +0800
commitcd8eae592e7ad9c2a2bbf34892a5ffb941a7db57 (patch)
treec2a4b76233b03ca155b9aeb223df68edf56d1910 /mail/folder-browser-ui.c
parent61300d7b247a126e2370e11075589fec81349ae7 (diff)
downloadgsoc2013-evolution-cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57.tar.gz
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/folder-browser-ui.c')
-rw-r--r--mail/folder-browser-ui.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index b5d76a5fb6..9ce54a16b3 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -309,7 +309,7 @@ ui_add (FolderBrowser *fb, const char *name, BonoboUIVerb verb[], EPixmap pixcac
/*bonobo_ui_component_freeze (uic, NULL);*/
- file = g_strconcat ("evolution-mail-", name, ".xml", NULL);
+ file = g_strconcat (EVOLUTION_UIDIR "/evolution-mail-", name, ".xml", NULL);
bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, file, "evolution-mail", NULL);
g_free (file);
@@ -359,7 +359,7 @@ folder_browser_ui_setup_view_menus (FolderBrowser *fb)
local_dir = gnome_util_prepend_user_home ("/evolution/views/mail/");
gal_view_collection_set_storage_directories
(collection,
- EVOLUTION_DATADIR "/evolution/views/mail/",
+ EVOLUTION_GALVIEWSDIR "/evolution/views/mail/",
local_dir);
g_free (local_dir);