[Commits] foldersel.c 1.26.2.49 1.26.2.49.2.1 prefs_actions.c 1.60.2.83 1.60.2.83.2.1 prefs_filtering_action.c 1.1.4.79 1.1.4.79.2.1 prefs_matcher.c 1.43.2.96 1.43.2.96.2.1 quote_fmt.c 1.8.2.47 1.8.2.47.2.1

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv25442/src

Modified Files:
      Tag: stable_3_9
	foldersel.c prefs_actions.c prefs_filtering_action.c 
	prefs_matcher.c quote_fmt.c 
Log Message:
2012-11-18 [colin]	3.9.0cvs6-stable

	* src/foldersel.c
	* src/prefs_actions.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/quote_fmt.c
	* src/gtk/description_window.c
	* src/gtk/description_window.h
	* src/gtk/inputdialog.c
	* src/gtk/manage_window.c
	* src/gtk/quicksearch.c
		Backport 3.9.0cvs10:
		Try to better fix focus problems. Should address:
		Bug #2774
		Bug #2624
		Bug #1963
		Please check using your favorite WM that the following works:
		Information button (Quicksearch, Templates, 'Test' filtering 
		condition)
		Folder selection (Move/Copy contextual menu,
		various preferences, including 'New folder').
		Tested with XFCE, Gnome Shell and Windows.

Index: prefs_actions.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_actions.c,v
retrieving revision 1.60.2.83
retrieving revision 1.60.2.83.2.1
diff -u -d -r1.60.2.83 -r1.60.2.83.2.1
--- prefs_actions.c	16 Sep 2012 21:56:20 -0000	1.60.2.83
+++ prefs_actions.c	18 Nov 2012 16:40:41 -0000	1.60.2.83.2.1
@@ -995,6 +995,7 @@
 static DescriptionWindow actions_desc_win = { 
 	NULL,
 	NULL,
+	TRUE,
 	2,
 	N_("Actions"),
   	N_("The Actions feature is a way for the user to launch "

Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.79
retrieving revision 1.1.4.79.2.1
diff -u -d -r1.1.4.79 -r1.1.4.79.2.1
--- prefs_filtering_action.c	12 Sep 2012 09:23:12 -0000	1.1.4.79
+++ prefs_filtering_action.c	18 Nov 2012 16:40:41 -0000	1.1.4.79.2.1
@@ -1247,7 +1247,8 @@
 
 static DescriptionWindow exec_desc_win = { 
 	NULL,
-        NULL, 
+        NULL,
+	TRUE,
         2,
         N_("Filtering Action: 'Execute'"),
 	N_("'Execute' allows you to send a message or message element "

Index: foldersel.c
===================================================================
RCS file: /home/claws-mail/claws/src/foldersel.c,v
retrieving revision 1.26.2.49
retrieving revision 1.26.2.49.2.1
diff -u -d -r1.26.2.49 -r1.26.2.49.2.1
--- foldersel.c	27 May 2012 17:30:50 -0000	1.26.2.49
+++ foldersel.c	18 Nov 2012 16:40:41 -0000	1.26.2.49.2.1
@@ -178,7 +178,7 @@
 	gtk_widget_grab_focus(ok_button);
 	gtk_widget_grab_focus(treeview);
 
-	gtk_widget_show(window);
+	gtk_window_present(window);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	manage_window_set_transient(GTK_WINDOW(window));
 
@@ -187,10 +187,8 @@
 	while (finished == FALSE)
 		gtk_main_iteration();
 
-	gtk_widget_hide(window);
-	gtk_window_set_modal(GTK_WINDOW(window), FALSE);
-	gtk_entry_set_text(GTK_ENTRY(entry), "");
-	gtk_tree_store_clear(tree_store);
+	gtk_widget_destroy(window);
+	window = NULL;
 
 	if (!cancelled &&
 	    selected_item && (selected_item->path || root_selectable)) {

Index: quote_fmt.c
===================================================================
RCS file: /home/claws-mail/claws/src/quote_fmt.c,v
retrieving revision 1.8.2.47
retrieving revision 1.8.2.47.2.1
diff -u -d -r1.8.2.47 -r1.8.2.47.2.1
--- quote_fmt.c	7 Jul 2012 07:09:30 -0000	1.8.2.47
+++ quote_fmt.c	18 Nov 2012 16:40:41 -0000	1.8.2.47.2.1
@@ -104,6 +104,7 @@
 static DescriptionWindow quote_desc_win = { 
         NULL,
 	NULL,
+	TRUE,
         2,
         N_("Description of symbols"),
 	N_("The following symbols and commands can be used:"),

Index: prefs_matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.96
retrieving revision 1.43.2.96.2.1
diff -u -d -r1.43.2.96 -r1.43.2.96.2.1
--- prefs_matcher.c	8 Sep 2012 20:23:11 -0000	1.43.2.96
+++ prefs_matcher.c	18 Nov 2012 16:40:41 -0000	1.43.2.96.2.1
@@ -2131,6 +2131,7 @@
 static DescriptionWindow test_desc_win = { 
 	NULL,
         NULL, 
+	TRUE,
         2,
         N_("Match Type: 'Test'"),
 	N_("'Test' allows you to test a message or message element "