CVS: sylpheedclaws/sylpheed-claws/src mainwindow.c,1.274.2.157,1.274.2.158 summaryview.c,1.395.2.270,1.395.2.271 summaryview.h,1.68.2.29,1.68.2.30

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv29057/src

Modified Files:
      Tag: gtk2
	mainwindow.c summaryview.c summaryview.h 
Log Message:
2006-12-14 [wwp]	2.6.1cvs32

	* src/mainwindow.c
	* src/summaryview.c
	* src/summaryview.h
	* src/gtk/quicksearch.c
		fix quicksearch 'magnify' button status when QS is closed
		using the Escape key, thanks to Colin.

Index: mainwindow.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/mainwindow.c,v
retrieving revision 1.274.2.157
retrieving revision 1.274.2.158
diff -u -d -r1.274.2.157 -r1.274.2.158
--- mainwindow.c	2006/11/26 11:15:37	1.274.2.157
+++ mainwindow.c	2006/12/14 08:37:52	1.274.2.158
@@ -3143,8 +3143,7 @@
 
 static void mainwindow_quicksearch(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-	prefs_common.show_searchbar = TRUE;
-	summaryview_activate_quicksearch(mainwin->summaryview);
+	summaryview_activate_quicksearch(mainwin->summaryview, TRUE);
 }
 
 static void toggle_folder_cb(MainWindow *mainwin, guint action,

Index: summaryview.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/summaryview.c,v
retrieving revision 1.395.2.270
retrieving revision 1.395.2.271
diff -u -d -r1.395.2.270 -r1.395.2.271
--- summaryview.c	2006/12/01 09:21:42	1.395.2.270
+++ summaryview.c	2006/12/14 08:37:53	1.395.2.271
@@ -5407,12 +5407,17 @@
 	}
 }
 
-void summaryview_activate_quicksearch(SummaryView *summaryview) 
+void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show) 
 {
+	prefs_common.show_searchbar = show;
 	gtk_toggle_button_set_active(
 		GTK_TOGGLE_BUTTON(summaryview->toggle_search), 
-		TRUE);
-	quicksearch_show(summaryview->quicksearch);
+		show);
+	if (show) {
+		quicksearch_show(summaryview->quicksearch);
+	} else {
+		quicksearch_hide(summaryview->quicksearch);
+	}
 }
 
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)

Index: summaryview.h
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/summaryview.h,v
retrieving revision 1.68.2.29
retrieving revision 1.68.2.30
diff -u -d -r1.68.2.29 -r1.68.2.30
--- summaryview.h	2006/11/07 10:39:33	1.68.2.29
+++ summaryview.h	2006/12/14 08:37:54	1.68.2.30
@@ -299,6 +299,6 @@
 void summaryview_lock(SummaryView *summaryview, FolderItem *item);
 void summaryview_unlock(SummaryView *summaryview, FolderItem *item);
 void summary_reflect_prefs(void);
-void summaryview_activate_quicksearch(SummaryView *summaryview);
+void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show);
 void summary_set_menu_sensitive	(SummaryView		*summaryview);
 #endif /* __SUMMARY_H__ */