** 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, 5 insertions, 7 deletions

diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 067fadd21d..9dffb61b43 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -161,6 +161,7 @@ ensure_sources (CalendarComponent *component)
 	ESource *personal_source;
 	ESource *birthdays_source;
 	char *base_uri, *base_uri_proto;
+	const gchar *base_dir;
 	gchar *create_source;
 
 	on_this_computer = NULL;
@@ -175,9 +176,8 @@ ensure_sources (CalendarComponent *component)
 		return;
 	}
 
-	base_uri = g_build_filename (calendar_component_peek_base_directory (component),
-				     "calendar", "local",
-				     NULL);
+	base_dir = calendar_component_peek_base_directory (component);
+	base_uri = g_build_filename (base_dir, "local", NULL);
 
 	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
 
@@ -1726,10 +1726,8 @@ calendar_component_init (CalendarComponent *component)
 
 	priv = g_new0 (CalendarComponentPrivate, 1);
 
-	priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL);
-	priv->config_directory = g_build_filename (g_get_home_dir (),
-						   ".evolution", "calendar", "config",
-						   NULL);
+	priv->base_directory = g_build_filename (e_get_user_data_dir (), "calendar", NULL);
+	priv->config_directory = g_build_filename (priv->base_directory, "config", NULL);
 
 	/* EPFIXME: Should use a custom one instead?  Also we should add
 	 * calendar_component_peek_gconf_client().  */