Merge branch 'master' into kill-bonobo

8 files changed, 34 insertions, 19 deletions

diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h
index 38a4a86fae..93c1b89261 100644
--- a/mail/e-mail-attachment-bar.h
+++ b/mail/e-mail-attachment-bar.h
@@ -23,7 +23,7 @@
 #define E_MAIL_ATTACHMENT_BAR_H
 
 #include <gtk/gtk.h>
-#include <widgets/misc/e-attachment-view.h>
+#include <misc/e-attachment-view.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_ATTACHMENT_BAR \
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 346344cfc4..7ffc873cb8 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1606,10 +1606,12 @@ mail_reader_key_press_event_cb (EMailReader *reader,
 			break;
 
 		case GDK_period:
+		case GDK_bracketleft:
 			action_name = "mail-next-unread";
 			break;
 
 		case GDK_comma:
+		case GDK_bracketright:
 			action_name = "mail-previous-unread";
 			break;
 
@@ -1623,7 +1625,7 @@ mail_reader_key_press_event_cb (EMailReader *reader,
 			break;
 #endif
 
-		case '!':
+		case GDK_exclam:
 			action_name = "mail-toggle-important";
 			break;
 
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index e835d28a87..e25d0553cb 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -3047,9 +3047,11 @@ emae_check_complete (EConfig *ec, const gchar *pageid, gpointer data)
 	const gchar *tmp;
 	EAccount *ea;
 	gboolean refresh = FALSE;
+	gboolean edit;
 
 	account = em_account_editor_get_modified_account (emae);
 	original_account = em_account_editor_get_modified_account (emae);
+	edit = (original_account != NULL);
 
 	/* We use the page-check of various pages to 'prepare' or
 	   pre-load their values, only in the druid */
@@ -3088,7 +3090,7 @@ emae_check_complete (EConfig *ec, const gchar *pageid, gpointer data)
 				index = check_servers (at);
 				gtk_entry_set_text (emae->priv->source.username, user);
 				gtk_entry_set_text (emae->priv->transport.username, user);
-				if (uri && (url = camel_url_new (uri, NULL)) != NULL) {
+				if (!edit && uri && (url = camel_url_new (uri, NULL)) != NULL) {
 					refresh = TRUE;
 					camel_url_set_protocol (url, mail_servers[index].proto);
 					camel_url_set_param (url, "use_ssl", mail_servers[index].ssl);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 23dcd94bbe..40abdcf37d 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -760,7 +760,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
 
 /* Editing messages... */
 
-static void
+static GtkWidget *
 edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 {
 	EMsgComposer *composer;
@@ -785,7 +785,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 		content = camel_medium_get_content_object ((CamelMedium *) message);
 		if (!content)
-			return;
+			return NULL;
 
 		/*
 		 * Get non-multipart content from multipart message.
@@ -798,11 +798,11 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 		}
 
 		if (!mime_part)
-			return;
+			return NULL;
 
 		type = camel_mime_part_get_content_type (mime_part);
 		if (!camel_content_type_is (type, "text", "plain"))
-			return;
+			return NULL;
 
 		mem = camel_stream_mem_new ();
 		camel_data_wrapper_decode_to_stream (content, mem);
@@ -909,7 +909,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 	composer_set_no_change (composer, TRUE, FALSE);
 
-	gtk_widget_show (GTK_WIDGET (composer));
+	if (!e_msg_composer_get_lite())
+		gtk_widget_show (GTK_WIDGET (composer));
+
+	return (GtkWidget *)composer;
 }
 
 /**
@@ -920,15 +923,18 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
  * Opens a composer filled in with the headers/mime-parts/etc of
  * @message.
  **/
-void
+GtkWidget *
 em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
 {
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+	GtkWidget *composer = NULL;
+	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 
 	if (folder)
-		edit_message (message, folder, NULL);
+		composer = edit_message (message, folder, NULL);
 	else
-		edit_message (message, NULL, NULL);
+		composer = edit_message (message, NULL, NULL);
+
+	return composer;
 }
 
 static void
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index b16a1e56b3..f8c2cd580c 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -38,7 +38,7 @@ EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
 /* FIXME: mailto?  url?  should make up its mind what its called.  imho use 'uri' */
 void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri);
 
-void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
+GtkWidget * em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
 void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace);
 
 void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index d10b88d645..96c2e13b3e 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -535,9 +535,6 @@ emft_key_press_event (GtkWidget *widget,
 	tree_view = GTK_TREE_VIEW (widget);
 	selection = gtk_tree_view_get_selection (tree_view);
 
-	if (event->keyval == GDK_space)
-		return TRUE;
-
 	if (gtk_tree_selection_get_mode (selection) == GTK_SELECTION_SINGLE)
 		emft_clear_selected_list (EM_FOLDER_TREE (widget));
 
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 1aab32d503..9c6f5f8908 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -113,7 +113,8 @@ em_vfolder_editor_new (EMVFolderContext *vc)
 	g_free (gladefile);
 
 	rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("Search _Folders"));
-        gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
+	gtk_widget_hide (glade_xml_get_widget (gui, "label17"));
+	gtk_widget_hide (glade_xml_get_widget (gui, "filter_source_combobox"));
 	g_object_unref (gui);
 
 	return GTK_WIDGET (ve);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 9cc75057fa..323d21f4d7 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -797,8 +797,15 @@ get_folders (CamelStore *store, GPtrArray *folders, CamelFolderInfo *info)
 	camel_exception_init (&ex);
 
 	while (info) {
-		if (camel_store_can_refresh_folder (store, info, &ex))
-			g_ptr_array_add (folders, g_strdup (info->uri));
+		if (camel_store_can_refresh_folder (store, info, &ex)) {
+			CamelURL *url = camel_url_new (info->uri, NULL);
+
+			if (url && (!camel_url_get_param (url, "noselect") || !g_str_equal (camel_url_get_param (url, "noselect"), "yes")))
+				g_ptr_array_add (folders, g_strdup (info->uri));
+
+			if (url)
+				camel_url_free (url);
+		}
 		camel_exception_clear (&ex);
 
 		get_folders (store, folders, info->child);