First successful build

1 files changed, 0 insertions, 44 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 76502314ab..920994242a 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -632,10 +632,7 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
-<<<<<<< HEAD
-=======
 	gboolean close_reader;
->>>>>>> master
 
 	folder = e_mail_reader_get_folder (reader);
 	window = e_mail_reader_get_window (reader);
@@ -650,14 +647,8 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	if (em_utils_ask_open_many (window, uids->len))
 		em_utils_forward_messages (
 			reader, folder, uids,
-<<<<<<< HEAD
-			E_MAIL_FORWARD_STYLE_QUOTED);
-
-	g_ptr_array_unref (uids);
-=======
 			E_MAIL_FORWARD_STYLE_QUOTED,
 			close_reader ? GTK_WIDGET (reader) : NULL);
->>>>>>> master
 
 	g_ptr_array_unref (uids);
 }
@@ -750,11 +741,7 @@ action_mail_mark_unread_cb (GtkAction *action,
 
 	/* Notify the tree model that the user has marked messages as
 	 * unread so it doesn't mistake the event as new mail arriving. */
-<<<<<<< HEAD
-	model = em_folder_tree_model_get_default (e_mail_reader_get_backend (reader));
-=======
 	model = em_folder_tree_model_get_default ();
->>>>>>> master
 	folder = e_mail_reader_get_folder (reader);
 	em_folder_tree_model_user_marked_unread (model, folder, n_marked);
 }
@@ -774,17 +761,10 @@ action_mail_message_edit_cb (GtkAction *action,
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
 	g_ptr_array_set_free_func (uids, (GDestroyNotify) g_free);
-<<<<<<< HEAD
-
-	replace = em_utils_folder_is_drafts (folder);
-	em_utils_edit_messages (reader, folder, uids, replace);
-
-=======
 
 	replace = em_utils_folder_is_drafts (folder);
 	em_utils_edit_messages (reader, folder, uids, replace);
 
->>>>>>> master
 	g_ptr_array_unref (uids);
 }
 
@@ -835,11 +815,7 @@ action_mail_move_cb (GtkAction *action,
 	uids = e_mail_reader_get_selected_uids (reader);
 	window = e_mail_reader_get_window (reader);
 
-<<<<<<< HEAD
-	model = em_folder_tree_model_get_default (backend);
-=======
 	model = em_folder_tree_model_get_default ();
->>>>>>> master
 
 	dialog = em_folder_selector_new (
 		window, backend, model,
@@ -1159,19 +1135,11 @@ action_mail_reply_all_check (CamelFolder *folder,
 	gint recip_count = 0;
 	EMailReplyType type = E_MAIL_REPLY_TO_ALL;
 	GError *error = NULL;
-<<<<<<< HEAD
-
-	alert_sink = e_activity_get_alert_sink (closure->activity);
-
-	message = camel_folder_get_message_finish (folder, result, &error);
-
-=======
 
 	alert_sink = e_activity_get_alert_sink (closure->activity);
 
 	message = camel_folder_get_message_finish (folder, result, &error);
 
->>>>>>> master
 	if (e_activity_handle_cancellation (closure->activity, error)) {
 		g_warn_if_fail (message == NULL);
 		mail_reader_closure_free (closure);
@@ -1352,17 +1320,6 @@ action_mail_reply_sender_check (CamelFolder *folder,
 	GError *error = NULL;
 
 	alert_sink = e_activity_get_alert_sink (closure->activity);
-<<<<<<< HEAD
-
-	message = camel_folder_get_message_finish (folder, result, &error);
-
-	if (e_activity_handle_cancellation (closure->activity, error)) {
-		g_warn_if_fail (message == NULL);
-		mail_reader_closure_free (closure);
-		g_error_free (error);
-		return;
-
-=======
 
 	message = camel_folder_get_message_finish (folder, result, &error);
 
@@ -1372,7 +1329,6 @@ action_mail_reply_sender_check (CamelFolder *folder,
 		g_error_free (error);
 		return;
 
->>>>>>> master
 	} else if (error != NULL) {
 		g_warn_if_fail (message == NULL);
 		e_alert_submit (