Merge branch 'express2'

11 files changed, 69 insertions, 69 deletions

diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 67c732d352..7f62c466ad 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <string.h>
 #include "e-mail-backend.h"
 
 #include "e-util/e-account-utils.h"
@@ -271,6 +272,11 @@ mail_backend_quit_requested_cb (EShell *shell,
 	if (!e_shell_get_online (shell))
 		return;
 
+	/* In express mode, don't raise mail request in non mail window. */
+	if (e_shell_get_express_mode(shell) &&
+		strcmp(e_shell_window_get_active_view((EShellWindow *)window), "mail") != 0)
+		return;
+
 	/* Check Outbox for any unsent messages. */
 
 	folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 6f7aec337d..3282af34af 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -699,9 +699,9 @@ headers_changed_cb (GConfClient *client,
 		gchar *xml = (gchar *)p->data;
 
 		h = e_mail_reader_header_from_xml (xml);
-		if (h && h->enabled) {
-			em_format_add_header (emf, h->name, EM_FORMAT_HEADER_BOLD);
-		}
+		if (h && h->enabled)
+			em_format_add_header (
+				emf, h->name, EM_FORMAT_HEADER_BOLD);
 
 		e_mail_reader_header_free (h);
 	}
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index ac36600725..4b02d69623 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1288,8 +1288,8 @@ static GtkActionEntry mail_reader_entries[] = {
 	  N_("Mark the selected messages as junk"),
 	  G_CALLBACK (action_mail_mark_junk_cb) },
 
-	{ "mail-mark-notjunk",
-	  "mail-mark-notjunk",
+	{ "mail-mark-not-junk",
+	  "mail-mark-not-junk",
 	  N_("_Not Junk"),
 	  "<Shift><Control>j",
 	  N_("Mark the selected messages as not being junk"),
@@ -1598,9 +1598,9 @@ static EPopupActionEntry mail_reader_popup_entries[] = {
 	  N_("Mark as _Junk"),
 	  "mail-mark-junk" },
 
-	{ "mail-popup-mark-notjunk",
+	{ "mail-popup-mark-not-junk",
 	  N_("Mark as _Not Junk"),
-	  "mail-mark-notjunk" },
+	  "mail-mark-not-junk" },
 
 	{ "mail-popup-mark-read",
 	  N_("Mar_k as Read"),
@@ -2303,11 +2303,13 @@ mail_reader_update_actions (EMailReader *reader)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-mark-junk";
-	sensitive = selection_has_not_junk_messages;
+	sensitive =
+		selection_has_not_junk_messages &&
+		!(state & E_MAIL_READER_FOLDER_IS_JUNK);
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK));
 
-	action_name = "mail-mark-notjunk";
+	action_name = "mail-mark-not-junk";
 	sensitive = selection_has_junk_messages;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 55b7399e7f..49f4356a5b 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2190,7 +2190,9 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 		gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity")));
 	}
 
-	emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", "identity_optional_table", "identity_optional_frame", NULL);
+	emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table",
+			    "identity_optional_table", "identity_optional_frame",
+			    "identity_address", NULL);
 
 	g_object_unref (builder);
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 82984d698e..514885c28b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -710,16 +710,14 @@ em_utils_composer_print_cb (EMsgComposer *composer,
 /* Composing messages... */
 
 static EMsgComposer *
-create_new_composer (const gchar *subject, const gchar *fromuri, gboolean lite)
+create_new_composer (const gchar *subject, const gchar *fromuri)
 {
 	EMsgComposer *composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 
-	if (lite)
-		composer = e_msg_composer_lite_new ();
-	else
-		composer = e_msg_composer_new ();
+	composer = e_msg_composer_new ();
+
 	table = e_msg_composer_get_header_table (composer);
 
 	if (fromuri != NULL) {
@@ -749,7 +747,7 @@ em_utils_compose_new_message (const gchar *fromuri)
 {
 	GtkWidget *composer;
 
-	composer = (GtkWidget *) create_new_composer ("", fromuri, FALSE);
+	composer = (GtkWidget *) create_new_composer ("", fromuri);
 	if (composer == NULL)
 		return;
 
@@ -759,26 +757,6 @@ em_utils_compose_new_message (const gchar *fromuri)
 }
 
 /**
- * em_utils_compose_lite_new_message:
- *
- * Opens a new composer window as a child window of @parent's toplevel
- * window.
- **/
-EMsgComposer *
-em_utils_compose_lite_new_message (const gchar *fromuri)
-{
-	GtkWidget *composer;
-
-	composer = (GtkWidget *) create_new_composer ("", fromuri, TRUE);
-	if (composer == NULL)
-		return NULL;
-
-	composer_set_no_change (E_MSG_COMPOSER (composer), TRUE, TRUE);
-
-	return E_MSG_COMPOSER (composer);
-}
-
-/**
  * em_utils_compose_new_message_with_mailto:
  * @url: mailto url
  *
@@ -806,8 +784,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
 
 	composer_set_no_change (composer, TRUE, url == NULL);
 
-	if (!e_msg_composer_get_lite ())
-		gtk_window_present (GTK_WINDOW (composer));
+	gtk_window_present (GTK_WINDOW (composer));
 
 	return composer;
 }
@@ -986,8 +963,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return (GtkWidget *)composer;
 }
@@ -1136,7 +1112,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 {
 	EMsgComposer *composer;
 
-	composer = create_new_composer (subject, fromuri, FALSE);
+	composer = create_new_composer (subject, fromuri);
 	if (composer == NULL)
 		return NULL;
 
@@ -1147,8 +1123,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return composer;
 }
@@ -1218,7 +1193,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 		text = em_utils_message_to_html (message, _("-------- Forwarded Message --------"), flags, &len, NULL, NULL, &validity_found);
 
 		if (text) {
-			composer = create_new_composer (subject, fromuri, FALSE);
+			composer = create_new_composer (subject, fromuri);
 
 			if (composer) {
 				if (CAMEL_IS_MULTIPART(camel_medium_get_content ((CamelMedium *)message)))
@@ -1235,8 +1210,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 
 				emu_update_composers_security (composer, validity_found);
 				composer_set_no_change (composer, TRUE, TRUE);
-				if (!e_msg_composer_get_lite())
-					gtk_widget_show (GTK_WIDGET (composer));
+				gtk_widget_show (GTK_WIDGET (composer));
 			}
 			g_free (text);
 		}
@@ -2283,8 +2257,7 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return composer;
 }
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index a3c6f1185c..1eb0d1bd30 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -30,7 +30,6 @@
 G_BEGIN_DECLS
 
 void em_utils_compose_new_message (const gchar *fromuri);
-EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
 
 /* FIXME: mailto?  url?  should make up its mind what its called.  imho use 'uri' */
 EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri);
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index e7262db9d0..37552bb555 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -39,6 +39,7 @@
 #include "mail-session.h"
 #include "mail-tools.h"
 #include "mail-mt.h"
+#include "mail-ops.h"
 
 /* sigh, these 2 only needed for outbox total count checking - a mess */
 #include "mail-folder-cache.h"
@@ -48,6 +49,7 @@
 #include "em-event.h"
 
 #include "e-mail-local.h"
+#include "e-mail-store.h"
 #include "shell/e-shell.h"
 
 #define d(x)
@@ -75,6 +77,7 @@ struct _EMFolderTreeModelPrivate {
 
 	gulong account_changed_id;
 	gulong account_removed_id;
+	gulong account_added_id;
 };
 
 enum {
@@ -251,6 +254,29 @@ account_removed_cb (EAccountList *accounts,
 	em_folder_tree_model_remove_store (model, si->store);
 }
 
+/* HACK: FIXME: the component should listen to the account object directly */
+static void
+add_new_store (gchar *uri, CamelStore *store, gpointer user_data)
+{
+	EAccount *account = user_data;
+
+	if (store == NULL)
+		return;
+
+	e_mail_store_add (store, account->name);
+}
+
+static void
+account_added_cb (EAccountList *accounts,
+                  EAccount *account,
+                  EMFolderTreeModel *model)
+{
+	const gchar *uri;
+
+	uri = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+	mail_get_store (uri, NULL, add_new_store, account);
+}
+
 static void
 folder_tree_model_selection_finalized_cb (EMFolderTreeModel *model)
 {
@@ -327,6 +353,8 @@ folder_tree_model_finalize (GObject *object)
 		priv->accounts, priv->account_changed_id);
 	g_signal_handler_disconnect (
 		priv->accounts, priv->account_removed_id);
+	g_signal_handler_disconnect (
+		priv->accounts, priv->account_added_id);
 
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -507,6 +535,9 @@ folder_tree_model_init (EMFolderTreeModel *model)
 	model->priv->account_removed_id = g_signal_connect (
 		model->priv->accounts, "account-removed",
 		G_CALLBACK (account_removed_cb), model);
+	model->priv->account_added_id = g_signal_connect (
+		model->priv->accounts, "account-added",
+		G_CALLBACK (account_added_cb), model);
 
 	g_signal_connect (mail_folder_cache_get_default (),
 			  "folder-unread-updated",
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index cb1e61b2c1..219e355cd5 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1157,6 +1157,8 @@ folder_tree_new (EMFolderTree *folder_tree)
 
 	folder_tree->priv->selectable = NULL;
 
+	folder_tree->priv->selectable = NULL;
+
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_append_column ((GtkTreeView *) tree, column);
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 86d9c88910..c142ca28b1 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -169,7 +169,7 @@ inline_filter_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		}
 
 		rest_len = inend - start;
-		if (inptr < inend) 
+		if (inptr < inend)
 			*inptr++ = 0;
 
 		#define restore_inptr() G_STMT_START { if (inptr < inend) inptr[-1] = '\n'; } G_STMT_END
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 64b44ffcde..ad1dfdc27a 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -160,21 +160,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/show_mail_from</key>
-      <applyto>/apps/evolution/mail/composer/show_mail_from</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show "From" field when sending a mail message</short>
-         <long>
-           Show the "From" field when sending a mail message.  This is
-           controlled from the View menu when a mail account is chosen.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/evolution/mail/composer/show_mail_reply_to</key>
       <applyto>/apps/evolution/mail/composer/show_mail_reply_to</applyto>
       <owner>evolution-mail</owner>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index d1489becf8..4afa6019b3 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -3029,7 +3029,7 @@ For example: "Work" or "Personal"</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox234">
+                          <object class="GtkHBox" id="hboxMailSizeLimit">
                             <property name="visible">True</property>
                             <property name="spacing">4</property>
                             <child>
@@ -3078,7 +3078,7 @@ For example: "Work" or "Personal"</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox233">
+                          <object class="GtkHBox" id="hboxShrinkAddresses">
                             <property name="visible">True</property>
                             <child>
                               <object class="GtkCheckButton" id="address_checkbox">
@@ -4587,7 +4587,7 @@ For example: "Work" or "Personal"</property>
                             <property name="visible">True</property>
                             <property name="spacing">2</property>
                             <child>
-                              <object class="GtkVBox" id="vbox207">
+                              <object class="GtkVBox" id="vboxTopPosting">
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">8</property>
@@ -4672,7 +4672,7 @@ For example: "Work" or "Personal"</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label506">
+              <object class="GtkLabel" id="labelAlerts">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Alerts</property>