Remove message_list_ensure_message().

No longer used.  Looks like a relic of some nasty hack.

2 files changed, 1 insertions, 25 deletions

diff --git a/mail/message-list.c b/mail/message-list.c
index adb4ff437c..c5fe5f4144 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2739,7 +2739,6 @@ message_list_finalize (GObject *object)
 		camel_folder_thread_messages_unref (message_list->thread_tree);
 
 	g_free (message_list->search);
-	g_free (message_list->ensure_uid);
 	g_free (message_list->frozen_search);
 	g_free (message_list->cursor_uid);
 
@@ -4318,17 +4317,6 @@ message_list_set_search (MessageList *ml,
 	}
 }
 
-/* will ensure that the message with UID uid will be in the message list after the next rebuild */
-void
-message_list_ensure_message (MessageList *ml,
-                             const gchar *uid)
-{
-	g_return_if_fail (ml != NULL);
-
-	g_free (ml->ensure_uid);
-	ml->ensure_uid = g_strdup (uid);
-}
-
 struct sort_column_data {
 	ETableCol *col;
 	gboolean ascending;
@@ -4546,18 +4534,12 @@ message_list_regen_tweak_search_results (MessageList *message_list,
 	 * Include the displayed message anyway so it doesn't suddenly
 	 * disappear while the user is reading it. */
 	needs_tweaking =
-		(message_list->ensure_uid != NULL) ||
 		(folder_changed && message_list->cursor_uid != NULL);
 
 	if (!needs_tweaking)
 		return;
 
-	if (message_list->ensure_uid != NULL)
-		uid = message_list->ensure_uid;
-	else
-		uid = message_list->cursor_uid;
-
-	g_return_if_fail (uid != NULL);
+	uid = message_list->cursor_uid;
 
 	/* Scan the search results for a particular UID.
 	 * If found then the results don't need tweaked. */
diff --git a/mail/message-list.h b/mail/message-list.h
index b57258d3e7..e3f322b22b 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -114,10 +114,6 @@ struct _MessageList {
 	/* Current search string, or %NULL */
 	gchar *search;
 
-	/* which message uid should be left in the list even not in a
-	 * search after rebuild; rebuild will clear the value to NULL */
-	gchar *ensure_uid;
-
 	/* are we regenerating the message_list because set_folder
 	 * was just called? */
 	guint just_set_folder : 1;
@@ -216,8 +212,6 @@ void		message_list_set_hidedeleted	(MessageList *message_list,
 						 gboolean hidedeleted);
 void		message_list_set_search		(MessageList *message_list,
 						 const gchar *search);
-void		message_list_ensure_message	(MessageList *message_list,
-						 const gchar *uid);
 void		message_list_save_state		(MessageList *message_list);
 
 void		message_list_sort_uids		(MessageList *message_list,