message_list_set_folder: Remove unused "outgoing" parameter.

3 files changed, 6 insertions, 21 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 6625d9bf40..a93d7260b5 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -3006,11 +3006,9 @@ mail_reader_set_folder (EMailReader *reader,
 	EMailReaderPrivate *priv;
 	EMailDisplay *display;
 	CamelFolder *previous_folder;
-	ESourceRegistry *registry;
 	GtkWidget *message_list;
 	EMailBackend *backend;
 	EShell *shell;
-	gboolean outgoing;
 	gboolean sync_folder;
 
 	priv = E_MAIL_READER_GET_PRIVATE (reader);
@@ -3023,7 +3021,6 @@ mail_reader_set_folder (EMailReader *reader,
 
 	backend = e_mail_reader_get_backend (reader);
 	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
-	registry = e_shell_get_registry (shell);
 
 	/* Only synchronize the real folder if we're online. */
 	sync_folder =
@@ -3037,11 +3034,6 @@ mail_reader_set_folder (EMailReader *reader,
 	if (folder == previous_folder)
 		return;
 
-	outgoing = folder != NULL && (
-		em_utils_folder_is_drafts (registry, folder) ||
-		em_utils_folder_is_outbox (registry, folder) ||
-		em_utils_folder_is_sent (registry, folder));
-
 	e_web_view_clear (E_WEB_VIEW (display));
 
 	priv->folder_was_just_selected = (folder != NULL);
@@ -3051,8 +3043,7 @@ mail_reader_set_folder (EMailReader *reader,
 	if (CAMEL_IS_VEE_FOLDER (folder))
 		mail_sync_folder (folder, FALSE, NULL, NULL);
 
-	message_list_set_folder (
-		MESSAGE_LIST (message_list), folder, outgoing);
+	message_list_set_folder (MESSAGE_LIST (message_list), folder);
 
 	mail_reader_emit_folder_loaded (reader);
 }
diff --git a/mail/message-list.c b/mail/message-list.c
index c5fe5f4144..ecd294251d 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2165,8 +2165,7 @@ message_list_save_state (MessageList *ml)
 }
 
 static void
-message_list_setup_etree (MessageList *message_list,
-                          gboolean outgoing)
+message_list_setup_etree (MessageList *message_list)
 {
 	/* build the spec based on the folder, and possibly from a saved file */
 	/* otherwise, leave default */
@@ -3707,16 +3706,12 @@ folder_changed (CamelFolder *folder,
  * message_list_set_folder:
  * @message_list: Message List widget
  * @folder: folder backend to be set
- * @outgoing: whether this is an outgoing folder
  *
- * Sets @folder to be the backend folder for @message_list. If
- * @outgoing is %TRUE, then the message-list UI changes to default to
- * the "Outgoing folder" column view.
+ * Sets @folder to be the backend folder for @message_list.
  **/
 void
 message_list_set_folder (MessageList *message_list,
-                         CamelFolder *folder,
-                         gboolean outgoing)
+                         CamelFolder *folder)
 {
 	ETreeModel *etm = message_list->model;
 	gboolean hide_deleted;
@@ -3817,7 +3812,7 @@ message_list_set_folder (MessageList *message_list,
 		composite_cell_set_strike_col (cell, strikeout_col);
 
 		/* Build the etree suitable for this folder */
-		message_list_setup_etree (message_list, outgoing);
+		message_list_setup_etree (message_list);
 
 		g_signal_connect (
 			folder, "changed",
diff --git a/mail/message-list.h b/mail/message-list.h
index 06c78c3a1b..7af58cba96 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -168,8 +168,7 @@ GType		message_list_get_type		(void);
 GtkWidget *	message_list_new		(EMailSession *session);
 EMailSession *	message_list_get_session	(MessageList *message_list);
 void		message_list_set_folder		(MessageList *message_list,
-						 CamelFolder *folder,
-						 gboolean outgoing);
+						 CamelFolder *folder);
 GtkTargetList *	message_list_get_copy_target_list
 						(MessageList *message_list);
 GtkTargetList *	message_list_get_paste_target_list