[evolution/wip/gsettings: 4/11] Merge branch 'master' into wip/gsettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 6b104de6536863409d853f1822075ff1393618c4
Merge: bd149b2 251b734
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Oct 26 11:57:13 2011 +0200

    Merge branch 'master' into wip/gsettings

 mail/e-mail-local.c                          |   23 +++----
 mail/e-mail-migrate.c                        |   78 +++++++++++-----------
 mail/e-mail-session.c                        |   72 ++++++++++++++++----
 mail/e-mail-store.c                          |   90 +++++++++++++++++---------
 mail/em-account-editor.c                     |   12 ++--
 mail/em-composer-utils.c                     |    4 +-
 mail/em-folder-tree-model.c                  |   10 ++-
 mail/mail-ops.c                              |   13 +++-
 mail/mail-tools.c                            |   20 ++++--
 mail/mail-vfolder.c                          |    9 +--
 modules/calendar/e-task-shell-view-private.c |    2 -
 modules/online-accounts/camel-sasl-xoauth.c  |   22 +++++-
 plugins/itip-formatter/itip-formatter.c      |    3 +-
 13 files changed, 224 insertions(+), 134 deletions(-)
---
diff --cc mail/mail-vfolder.c
index f2f9219,66438f5..2d491e1
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@@ -1174,14 -1171,12 +1171,12 @@@ vfolder_load_storage (EMailBackend *bac
  		}
  	}
  
- 	g_free (storeuri);
- 
  	/* reenable the feature if required */
 -	client = gconf_client_get_default ();
 -	key = "/apps/evolution/mail/display/enable_vfolders";
 -	if (!gconf_client_get_bool (client, key, NULL))
 -		gconf_client_set_bool (client, key, TRUE, NULL);
 -	g_object_unref (client);
 +	settings = g_settings_new ("org.gnome.evolution.mail");
 +	key = "enable-vfolders";
 +	if (!g_settings_get_boolean (settings, key))
 +		g_settings_set_boolean (settings, key, TRUE);
 +	g_object_unref (settings);
  
  	folder_cache = e_mail_session_get_folder_cache (session);