commit - b2d8e263d1424145d8bdf97ebca2c1d7b5f479ba
commit + 25e4063a61882785816e55a5ebce26b858e0baaf
blob - dd13ca8a62375d6936e8e8426d8aebbf6b4e6736
blob + a3a4372daf8f648d3e2ac07860e24c3515feff4c
--- src/folderview.c
+++ src/folderview.c
@@ -1602,27 +1602,6 @@ static void folderview_update_node(FolderView *folderv
 		folderview_update_node(folderview, node);
 }
 
-void folderview_update_search_icon(FolderItem *item, gboolean matches)
-{
-	GList *list;
-	FolderView *folderview;
-	GtkCMCTree *ctree;
-	GtkCMCTreeNode *node;
-
-	cm_return_if_fail(item != NULL);
-
-	for (list = folderview_list; list != NULL; list = list->next) {
-		folderview = (FolderView *)list->data;
-		ctree = GTK_CMCTREE(folderview->ctree);
-
-		node = gtk_cmctree_find_by_row_data(ctree, NULL, item);
-		if (node && item->search_match != matches) {
-			item->search_match = matches;
-			folderview_update_node(folderview, node);
-		}
-	}
-}
-
 static gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
 	FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
@@ -2578,19 +2557,6 @@ static gboolean folderview_dnd_scroll_cb(gpointer data
 
 static void free_info(gpointer stuff, gpointer data) { g_free(stuff); }
 
-void folderview_unregister_popup(FolderViewPopup *fpopup)
-{
-	GList *folderviews;
-
-
-	for (folderviews = folderview_list; folderviews != NULL; folderviews = g_list_next(folderviews)) {
-		FolderView *folderview = folderviews->data;
-
-		g_hash_table_remove(folderview->popups, fpopup->klass);
-	}
-	g_hash_table_remove(folderview_popups, fpopup->klass);
-}
-
 void folderview_remove_item(FolderView *folderview, FolderItem *item)
 {
 	g_return_if_fail(folderview != NULL);
blob - d446bd45917e9d7f1b6dc93e85398a5069fda99d
blob + a7cc975e029e41cf0d9df3fb82204a1a333be0c9
--- src/folderview.h
+++ src/folderview.h
@@ -69,7 +69,6 @@ struct _FolderView
 	gint folder_update_callback_id;
 	gint folder_item_update_callback_id;
 
-	GtkTargetList *target_list; /* DnD */
 	FolderColumnState col_state[N_FOLDER_COLS];
 	gint col_pos[N_FOLDER_COLS];
 	Folder *scanning_folder;
@@ -128,9 +127,6 @@ void folderview_move_folder		(FolderView 	*folderview,
 					 FolderItem 	*to_folder,
 					 gboolean	 copy);
 
-void folderview_unregister_popup	(FolderViewPopup	*fpopup);
-void folderview_update_search_icon	(FolderItem 		*item,
-					 gboolean 		 matches);
 void folderview_set_column_order	(FolderView		*folderview);
 
 void folderview_close_opened		(FolderView 		*folderview,
blob - 79b008002735b0346ecbfce17d9173fbcbdf1a73
blob + 7e718d1fe7c3dc02ad11b83b73d9440d641316fa
--- src/mainwindow.c
+++ src/mainwindow.c
@@ -335,8 +335,6 @@ static void toggle_work_offline_cb(GtkAction	*action,
 static void sync_cb		 ( GtkAction	*action,
 				  gpointer	 data );
 
-static void forget_session_passwords_cb	(GtkAction	*action,
-					 gpointer	 data );
 static gboolean mainwindow_focus_in_event	(GtkWidget	*widget,
 						 GdkEventFocus	*focus,
 						 gpointer	 data);
@@ -613,9 +611,6 @@ static GtkActionEntry mainwin_entries[] =
 	/* {"Tools/---",                             NULL, "---", NULL, NULL, NULL }, */
 	{"Tools/NetworkLog",                         NULL, N_("Network _Log"), "<shift><control>L", NULL, G_CALLBACK(log_window_show_cb) },
 
-	/* {"Tools/---",                             NULL, "---", NULL, NULL, NULL }, */
-	{"Tools/ForgetSessionPasswords",             NULL, N_("_Forget all session passwords"), NULL, NULL, G_CALLBACK(forget_session_passwords_cb) },
-
 /* Configuration menu */
 	{"Configuration/ChangeAccount",              NULL, N_("C_hange current account"), NULL, NULL, NULL },
 	{"Configuration/ChangeAccount/PlaceHolder",  NULL, "Placeholder", NULL, NULL, G_CALLBACK(mainwindow_nothing_cb) },
@@ -1209,9 +1204,6 @@ MainWindow *main_window_create()
 
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator7", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "NetworkLog", "Tools/NetworkLog", GTK_UI_MANAGER_MENUITEM)
-	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator8", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
-	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "ForgetSessionPasswords", "Tools/ForgetSessionPasswords", GTK_UI_MANAGER_MENUITEM)
-	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator9", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 
 /* Configuration menu */
 	MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Configuration", "ChangeAccount", "Configuration/ChangeAccount", GTK_UI_MANAGER_MENU)
@@ -2223,14 +2215,6 @@ SensitiveCondMask main_window_get_current_state(MainWi
 	if (mainwin->in_folder)
 		UPDATE_STATE(M_IN_MSGLIST);
 
-	for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
-		PrefsAccount *account = account_list->data;
-		if (account->session_passwd || account->session_smtp_passwd) {
-			UPDATE_STATE(M_SESSION_PASSWORDS);
-			break;
-		}
-	}
-
 #undef UPDATE_STATE
 
 	return state;
@@ -2342,7 +2326,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwi
 	SET_SENSITIVE("Menu/Tools/AddSenderToAB", M_SINGLE_TARGET_EXIST);
 	SET_SENSITIVE("Menu/Tools/Execute", M_DELAY_EXEC);
 	SET_SENSITIVE("Menu/Tools/Expunge", M_DELETED_EXISTS);
-	SET_SENSITIVE("Menu/Tools/ForgetSessionPasswords", M_SESSION_PASSWORDS);
 	SET_SENSITIVE("Menu/Tools/DeleteDuplicates/SelFolder", M_MSG_EXIST, M_ALLOW_DELETE);
 
 	SET_SENSITIVE("Menu/Configuration", M_UNLOCKED);
@@ -3956,32 +3939,6 @@ static void sync_cb(GtkAction *action, gpointer data)
 	mainwindow_check_synchronise(mainwin, FALSE);
 }
 
-static void forget_session_passwords_cb(GtkAction *action, gpointer data)
-{
-	MainWindow *mainwin = (MainWindow *)data;
-	GList *list = NULL;
-        gint fgtn = 0;
-	gint accs = 0;
-
-	main_window_lock(mainwin);
-	for (list = account_get_list(); list != NULL; list = list->next) {
-		PrefsAccount *account = list->data;
-		if (account->session_passwd) {
-			g_free(account->session_passwd);
-			account->session_passwd = NULL;
-			++fgtn;
-		}
-		if (account->session_smtp_passwd) {
-			g_free(account->session_smtp_passwd);
-			account->session_smtp_passwd = NULL;
-			++fgtn;
-		}
-		++accs;
-	}
-	main_window_unlock(mainwin);
-	alertpanel_notice("Forgotten %d passwords in %d accounts.\n", fgtn, accs);
-}
-
 void mainwindow_jump_to(const gchar *target, gboolean popup)
 {
 	gchar *tmp = NULL;
blob - 202c27f90948d88038df5403a9174178971c3b48
blob + e8164de8d7dbe0458aa7dd835c229a44a2a06b2a
--- src/summaryview.c
+++ src/summaryview.c
@@ -821,19 +821,6 @@ static void summary_switch_from_to(SummaryView *summar
 	summary_set_column_titles(summaryview);
 }
 
-static void summaryview_reset_recursive_folder_match(SummaryView *summaryview)
-{
-	GSList *cur;
-
-	for (cur = summaryview->recursive_matched_folders; cur != NULL; cur = cur->next) {
-		folderview_update_search_icon(cur->data, FALSE);
-	}
-
-	g_slist_free(summaryview->recursive_matched_folders);
-	summaryview->recursive_matched_folders = NULL;
-	summaryview->search_root_folder = NULL;
-}
-
 static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
 {
 	int u = 0, n = 0, m = 0, t = 0, r = 0, f = 0, l = 0, i = 0, w = 0;