Merge lp:~cyphermox/evolution/2011-02-25 into lp:~ubuntu-desktop/evolution/ubuntu

[Mathieu Trudel-Lapierre]

[Michael Terry (mterry)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-24 15:33:04 +0000
+++ debian/changelog	2011-02-25 19:04:56 +0000
@@ -1,3 +1,13 @@
+evolution (2.32.2-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/evolution-plugins.install: Re-add the face plugin that was dropped
+    accidentally. (LP: #682266)
+  * debian/patches/96_git_sent_draft_folders_wizard_setup_7215cf0.patch: Set
+    remote Sent and Drafts folders when setting up accounts using the startup
+    wizard. (LP: #720383)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 25 Feb 2011 11:10:51 -0500
+
 evolution (2.32.2-0ubuntu2) natty; urgency=low
 
   * debian/patches/10_desktop_shortcuts.patch

=== modified file 'debian/evolution-plugins.install'
--- debian/evolution-plugins.install	2010-10-18 16:24:22 +0000
+++ debian/evolution-plugins.install	2011-02-25 19:04:56 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/2.32/plugins/*{attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,pst-import,image-inline}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/2.32/plugins/*{face,attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,pst-import,image-inline}*.{so,eplug,xml}

=== added file 'debian/patches/96_git_sent_draft_folders_wizard_setup_7215cf0.patch'
--- debian/patches/96_git_sent_draft_folders_wizard_setup_7215cf0.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/96_git_sent_draft_folders_wizard_setup_7215cf0.patch	2011-02-25 19:04:56 +0000
@@ -0,0 +1,98 @@
+From 7215cf088f73cfa61e877a83fa0fdd4227095725 Mon Sep 17 00:00:00 2001
+From: Milan Crha <[e-mail]>
+Date: Fri, 11 Feb 2011 11:58:29 +0000
+Subject: Bug #637727 - Sent/Draft folder not set in startup-wizard account
+
+With modifications due to backporting of the patch for 2.91 to 2.32,
+by Mathieu Trudel-Lapierre <[e-mail]>
+
+---
+Index: evolution-2.32.2/mail/e-mail-local.c
+===================================================================
+--- evolution-2.32.2.orig/mail/e-mail-local.c	2010-10-14 17:18:36.000000000 -0400
++++ evolution-2.32.2/mail/e-mail-local.c	2011-02-25 13:03:24.277179299 -0500
+@@ -43,20 +43,24 @@
+ };
+ 
+ static CamelStore *local_store;
++static gboolean mail_local_initialized = FALSE;
+ 
+ void
+ e_mail_local_init (const gchar *data_dir)
+ {
+-	static gboolean initialized = FALSE;
+ 	CamelService *service;
+ 	CamelURL *url;
+ 	gchar *temp;
+ 	gint ii;
+ 	GError *local_error = NULL;
+ 
+-	g_return_if_fail (!initialized);
++	if (mail_local_initialized)
++		return;
++
+ 	g_return_if_fail (data_dir != NULL);
+ 
++	mail_local_initialized = TRUE;
++
+ 	url = camel_url_new ("mbox:", NULL);
+ 	temp = g_build_filename (data_dir, "local", NULL);
+ 	camel_url_set_path (url, temp);
+@@ -106,6 +110,7 @@
+ CamelFolder *
+ e_mail_local_get_folder (EMailLocalFolder type)
+ {
++	g_return_val_if_fail (mail_local_initialized, NULL);
+ 	g_return_val_if_fail (CHECK_LOCAL_FOLDER_TYPE (type), NULL);
+ 
+ 	return default_local_folders[type].folder;
+@@ -114,6 +119,7 @@
+ const gchar *
+ e_mail_local_get_folder_uri (EMailLocalFolder type)
+ {
++	g_return_val_if_fail (mail_local_initialized, NULL);
+ 	g_return_val_if_fail (CHECK_LOCAL_FOLDER_TYPE (type), NULL);
+ 
+ 	return default_local_folders[type].folder_uri;
+@@ -122,6 +128,7 @@
+ CamelStore *
+ e_mail_local_get_store (void)
+ {
++	g_return_val_if_fail (mail_local_initialized, NULL);
+ 	g_return_val_if_fail (CAMEL_IS_STORE (local_store), NULL);
+ 
+ 	return local_store;
+Index: evolution-2.32.2/modules/startup-wizard/evolution-startup-wizard.c
+===================================================================
+--- evolution-2.32.2.orig/modules/startup-wizard/evolution-startup-wizard.c	2010-10-14 17:18:38.000000000 -0400
++++ evolution-2.32.2/modules/startup-wizard/evolution-startup-wizard.c	2011-02-25 13:04:41.927179275 -0500
+@@ -25,6 +25,7 @@
+ #include <e-util/e-extension.h>
+ #include <e-util/e-import.h>
+ 
++#include <mail/e-mail-local.h>
+ #include <mail/em-account-editor.h>
+ #include <capplet/settings/mail-capplet-shell.h>
+ #include <calendar/gui/calendar-config.h>
+@@ -424,11 +425,21 @@
+ static GtkWidget *
+ startup_wizard_new_assistant (EStartupWizard *extension)
+ {
++	EShell *shell;
++	EShellBackend *shell_backend;
+ 	EMAccountEditor *emae;
+ 	EConfig *config;
+ 	EConfigItem *config_item;
+ 	GtkWidget *widget;
+ 	GSList *items = NULL;
++	const gchar *data_dir;
++
++	shell = startup_wizard_get_shell (extension);
++	shell_backend = e_shell_get_backend_by_name (shell, "mail");
++
++	data_dir = e_shell_backend_get_data_dir (shell_backend);
++
++	e_mail_local_init (data_dir);
+ 
+ 	emae = em_account_editor_new (
+ 		NULL, EMAE_ASSISTANT,

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-07 03:55:05 +0000
+++ debian/patches/series	2011-02-25 19:04:56 +0000
@@ -28,3 +28,4 @@
 95-git-16-quote_names_in_preview_d132f8f.patch
 95-git-17_bcc_search_rules_06ba028.patch
 95-git-18-crash_on_contact_move_098a7ab.patch
+96_git_sent_draft_folders_wizard_setup_7215cf0.patch