[Commits] quicksearch.c 1.1.2.106 1.1.2.107 quicksearch.h 1.1.2.22 1.1.2.23

[pawel at claws-mail.org]

Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv31919/src/gtk

Modified Files:
      Tag: gtk2
	quicksearch.c quicksearch.h 
Log Message:
2011-12-09 [pawel]	3.7.10cvs112

	* src/summaryview.c
	* src/gtk/quicksearch.c
	* src/gtk/quicksearch.h
		Invalidate quicksearch root folder when removed
		Fixes bug #2560 'crash when unsubscribing newsgroup and
		having active search field'

Index: quicksearch.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/quicksearch.c,v
retrieving revision 1.1.2.106
retrieving revision 1.1.2.107
diff -u -d -r1.1.2.106 -r1.1.2.107
--- quicksearch.c	22 Oct 2011 17:09:04 -0000	1.1.2.106
+++ quicksearch.c	9 Dec 2011 20:29:21 -0000	1.1.2.107
@@ -50,7 +50,6 @@
 {
 	QuickSearchType			 type;
 	gchar				*matchstring;
-	FolderItem			*folderItem;
 	gboolean			 recursive;
 };
 typedef struct _QuickSearchRequest QuickSearchRequest;
@@ -1511,6 +1510,12 @@
 	quicksearch->root_folder_item = NULL;
 }
 
+void quicksearch_folder_item_invalidate(QuickSearch *quicksearch, FolderItem *item)
+{
+	if (quicksearch->root_folder_item == item)
+		quicksearch->root_folder_item = NULL;
+}
+
 gboolean quicksearch_is_in_typing(QuickSearch *quicksearch)
 {
 	return quicksearch->in_typing;

Index: quicksearch.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/quicksearch.h,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -d -r1.1.2.22 -r1.1.2.23
--- quicksearch.h	16 Feb 2011 07:16:22 -0000	1.1.2.22
+++ quicksearch.h	9 Dec 2011 20:29:21 -0000	1.1.2.23
@@ -65,4 +65,5 @@
 gboolean quicksearch_is_in_typing(QuickSearch *quicksearch);
 void quicksearch_relayout(QuickSearch *quicksearch);
 void quicksearch_set_search_strings(QuickSearch *quicksearch);
+void quicksearch_folder_item_invalidate(QuickSearch *quicksearch, FolderItem *item);
 #endif /* QUICKSEARCH_H */