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

[Rodrigo Moya <rodrigo src gnome org>]

commit b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89
Merge: 9744056 8f54931
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Fri Oct 28 11:38:03 2011 +0200

    Merge branch 'master' into wip/gsettings

 capplet/anjal-settings-main.c            |    5 --
 capplet/settings/mail-capplet-shell.c    |    2 +-
 capplet/settings/mail-guess-servers.c    |    4 +-
 mail/e-mail-backend.c                    |   11 +++--
 mail/e-mail-migrate.c                    |   12 ++++--
 mail/e-mail-store.c                      |   57 +++++++++----------------
 mail/e-mail-store.h                      |   14 +++---
 mail/em-account-editor.c                 |    4 +-
 mail/em-folder-tree-model.c              |    4 +-
 mail/em-folder-tree.c                    |    4 +-
 mail/mail-vfolder.c                      |    2 +-
 modules/mail/e-mail-shell-backend.c      |    7 ++-
 modules/mail/e-mail-shell-view-actions.c |    8 +++-
 modules/mail/em-account-prefs.c          |   14 ++++--
 plugins/pst-import/pst-importer.c        |   67 +++++++++++++++++++++++++++--
 shell/main.c                             |    4 --
 16 files changed, 136 insertions(+), 83 deletions(-)
---
diff --cc modules/mail/em-account-prefs.c
index f4a0a74,ddf51d8..4bd6c1c
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@@ -116,8 -117,8 +117,9 @@@ account_prefs_disable_account_cb (EAcco
                                    EMAccountPrefs *prefs)
  {
  	EAccountList *account_list;
 +	EMailSession *session;
  	EAccount *account;
+ 	EMailSession *session;
  	gpointer parent;
  	gint response;
  
@@@ -322,8 -325,8 +326,9 @@@ account_prefs_delete_account (EAccountM
  	EMAccountPrefsPrivate *priv;
  	EAccountTreeView *tree_view;
  	EAccountList *account_list;
 +	EMailSession *session;
  	EAccount *account;
+ 	EMailSession *session;
  	gboolean has_proxies;
  	gpointer parent;
  	gint response;