** Fixes bug #513951

2008-03-11  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #513951

	* addressbook/gui/component/addressbook-component.c (ensure_sources):
	* addressbook/gui/component/addressbook-migrate.c (addressbook_migrate):
	* calendar/gui/cal-search-bar.c (cal_search_bar_construct):
	* calendar/gui/migration.c (create_calendar_sources),
	(create_task_sources), (migrate_calendars), (migrate_tasks),
	(create_memo_sources):
	* calendar/gui/e-memos.c (e_memos_setup_view_menus):
	* calendar/gui/tasks-component.c (ensure_sources):
	* calendar/gui/gnome-cal.c (gnome_calendar_setup_view_menus):
	* calendar/gui/calendar-component.c (ensure_sources):
	* calendar/gui/memos-component.c (ensure_sources):
	* mail/mail-config.c (gconf_mime_types_changed):
	Adapt to new meaning of xxx_component_peek_base_directory().

	* addressbook/gui/component/addressbook-component.c
	(addressbook_component_init):
	* addressbook/gui/component/addressbook-migrate.c (create_groups):
	* calendar/gui/tasks-component.c (tasks_component_init):
	* calendar/gui/calendar-component.c (calendar_component_init):
	* calendar/gui/memos-component.c (memos_component_init):
	* composer/e-msg-composer.c (autosave_manager_query_load_orphans),
	(autosave_init_file):
	* e-util/e-mktemp.c (get_dir):
	* e-util/e-util.c (get_lock_filename):
	* mail/mail-component.c:
	* plugins/face/face.c (org_gnome_composer_face):
	* smime/lib/e-cert-db.c (initialize_nss):
	Use e_get_user_data_dir() instead of constructing the full path.

	* calendar/gui/migration.c (add_gw_esource):
	* composer/e-msg-composer.c (e_msg-composer_unrealize),
	(e_msg_composer_set_view_from), (e_msg_composer_set_view_replyto),
	(e_msg_composer_set_view_to), (e_msg_composer_set_view_postto),
	(e_msg_composer_set_view_cc), (e_msg_composer_set_view_bcc):
	* e-util/e-util.c (e_file_update_save_path), (e_file_get_save_path):
	Emit warnings if saving to GConf fails.

	* e-util/e-util.c (e_get_user_data_dir):
	New function returns the base directory for Evolution user data.
	This should be the /only/ place in the application where this
	directory is hard-coded.


svn path=/trunk/; revision=35175

1 files changed, 9 insertions, 3 deletions

diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index fdaa0ff791..58ba068355 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -37,6 +37,9 @@
 #include <filter/rule-editor.h>
 
 #include "cal-search-bar.h"
+#include "calendar-component.h"
+#include "memos-component.h"
+#include "tasks-component.h"
 
 #include "e-util/e-util.h"
 #include "e-util/e-error.h"
@@ -736,6 +739,7 @@ cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags)
 	FilterPart *part;
 	RuleContext *search_context;
 	FilterRule  *search_rule;
+	const gchar *base_dir;
 
 	g_return_val_if_fail (IS_CAL_SEARCH_BAR (cal_search), NULL);
 
@@ -760,16 +764,18 @@ cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags)
 			rule_context_add_rule, rule_context_next_rule);
 
 	if (flags == CAL_SEARCH_MEMOS_DEFAULT) {
-		userfile = g_build_filename (g_get_home_dir (), ".evolution", "memos", "searches.xml", NULL);
+		base_dir = memos_component_peek_base_directory (memos_component_peek ());
 		xmlfile = g_build_filename (SEARCH_RULE_DIR, "memotypes.xml", NULL);
 	} else if (flags == CAL_SEARCH_TASKS_DEFAULT) {
-		userfile = g_build_filename (g_get_home_dir (), ".evolution", "tasks", "searches.xml", NULL);
+		base_dir = tasks_component_peek_base_directory (tasks_component_peek ());
 		xmlfile = g_build_filename (SEARCH_RULE_DIR, "tasktypes.xml", NULL);
 	} else {
-		userfile = g_build_filename (g_get_home_dir (), ".evolution", "calendar", "searches.xml", NULL);
+		base_dir = calendar_component_peek_base_directory (calendar_component_peek ());
 		xmlfile = g_build_filename (SEARCH_RULE_DIR, "caltypes.xml", NULL);
 	}
 
+	userfile = g_build_filename (base_dir, "searches.xml", NULL);
+
 	g_object_set_data_full (G_OBJECT (search_context), "user", userfile, g_free);
 	g_object_set_data_full (G_OBJECT (search_context), "system", xmlfile, g_free);