From e0d5ae3e97f318fb60674de189c8eff91477bac9 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 11 Mar 2008 15:20:59 +0000
Subject: ** 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
---
 e-util/e-util.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'e-util/e-util.c')

diff --git a/e-util/e-util.c b/e-util/e-util.c
index b1634bcfff..87a78341f2 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -49,6 +49,26 @@
 #include "e-util.h"
 #include "e-util-private.h"
 
+/**
+ * e_get_user_data_dir:
+ *
+ * Returns the base directory for Evolution-specific user data.
+ * The string is owned by Evolution and must not be modified or freed.
+ *
+ * Returns: base directory for user data
+ **/
+const gchar *
+e_get_user_data_dir (void)
+{
+	static gchar* dirname = NULL;
+
+	if (G_UNLIKELY (dirname == NULL))
+		dirname = g_build_filename (
+			g_get_home_dir (), ".evolution", NULL);
+
+	return dirname;
+}
+
 /**
  * e_str_without_underscores:
  * @s: the string to strip underscores from.
@@ -989,8 +1009,13 @@ void
 e_file_update_save_path (gchar *uri, gboolean free)
 {
 	GConfClient *gconf = gconf_client_get_default();
+	GError *error = NULL;
 
-	gconf_client_set_string(gconf, "/apps/evolution/mail/save_dir", uri, NULL);
+	gconf_client_set_string(gconf, "/apps/evolution/mail/save_dir", uri, &error);
+	if (error != NULL) {
+		g_warning("%s (%s) %s", G_STRLOC, G_STRFUNC, error->message);
+		g_clear_error(&error);
+	}
 	g_object_unref(gconf);
 	if (free)
 		g_free(uri);
@@ -1007,9 +1032,14 @@ gchar *
 e_file_get_save_path (void)
 {
 	GConfClient *gconf = gconf_client_get_default();
+	GError *error = NULL;
 	gchar *uri;
 
-	uri = gconf_client_get_string(gconf, "/apps/evolution/mail/save_dir", NULL);
+	uri = gconf_client_get_string(gconf, "/apps/evolution/mail/save_dir", &error);
+	if (error != NULL) {
+		g_warning("%s (%s) %s", G_STRLOC, G_STRFUNC, error->message);
+		g_clear_error(&error);
+	}
 	g_object_unref(gconf);
 
 	if (uri == NULL)
@@ -1027,7 +1057,7 @@ get_lock_filename (void)
 	static gchar *filename = NULL;
 
 	if (G_UNLIKELY (filename == NULL))
-		filename = g_build_filename (g_get_home_dir (), ".evolution", LOCK_FILE, NULL);
+		filename = g_build_filename (e_get_user_data_dir (), LOCK_FILE, NULL);
 
 	return filename;
 }
-- 
cgit v1.2.3