[Commits] compose.c 1.382.2.591 1.382.2.592 main.c 1.115.2.243 1.115.2.244

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	compose.c main.c 
Log Message:
2011-11-01 [colin]	3.7.10cvs67

	* src/compose.c
	* src/main.c
	* src/common/utils.c
	* src/gtk/gtkaspell.c
	* src/gtk/gtkaspell.h
		Fix huge slowness induced by spellcheck "while typing"
		during initial quote rewraps.

Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.591
retrieving revision 1.382.2.592
diff -u -d -r1.382.2.591 -r1.382.2.592
--- compose.c	31 Oct 2011 07:12:50 -0000	1.382.2.591
+++ compose.c	1 Nov 2011 20:29:30 -0000	1.382.2.592
@@ -1584,7 +1584,8 @@
 
 	undo_block(compose->undostruct);
 #ifdef USE_ENCHANT
-		compose_set_dictionaries_from_folder_prefs(compose, msginfo->folder);
+	compose_set_dictionaries_from_folder_prefs(compose, msginfo->folder);
+	gtkaspell_block_check(compose->gtkaspell);
 #endif
 
 	if (quote_mode == COMPOSE_QUOTE_FORCED ||
@@ -1620,10 +1621,6 @@
 					  _("The body of the \"Reply\" template has an error at line %d."));
 		compose_attach_from_list(compose, quote_fmt_get_attachments_list(), FALSE);
 		quote_fmt_reset_vartable();
-#ifdef USE_ENCHANT
-		if (compose->gtkaspell && compose->gtkaspell->check_while_typing)
-			gtkaspell_highlight_all(compose->gtkaspell);
-#endif
 	}
 
 	if (MSG_IS_ENCRYPTED(compose->replyinfo->flags)) {
@@ -1643,6 +1640,11 @@
 
 	compose_wrap_all(compose);
 
+#ifdef USE_ENCHANT
+	if (compose->gtkaspell && compose->gtkaspell->check_while_typing)
+		gtkaspell_highlight_all(compose->gtkaspell);
+	gtkaspell_unblock_check(compose->gtkaspell);
+#endif
 	SIGNAL_UNBLOCK(textbuf);
 	
 	gtk_widget_grab_focus(compose->text);
@@ -1741,6 +1743,7 @@
 		pref_get_unescaped_pref(tmp, msginfo->folder->prefs->forward_override_from_format);
 
 #ifdef USE_ENCHANT
+		gtkaspell_block_check(compose->gtkaspell);
 		quote_fmt_init(full_msginfo, NULL, NULL, FALSE, compose->account, FALSE,
 				compose->gtkaspell);
 #else
@@ -1822,10 +1825,6 @@
 		compose_attach_parts(compose, msginfo);
 
 		procmsg_msginfo_free(full_msginfo);
-#ifdef USE_ENCHANT
-		if (compose->gtkaspell && compose->gtkaspell->check_while_typing)
-			gtkaspell_highlight_all(compose->gtkaspell);
-#endif
 	}
 
 	SIGNAL_BLOCK(textbuf);
@@ -1835,6 +1834,11 @@
 
 	compose_wrap_all(compose);
 
+#ifdef USE_ENCHANT
+	if (compose->gtkaspell && compose->gtkaspell->check_while_typing)
+		gtkaspell_highlight_all(compose->gtkaspell);
+	gtkaspell_unblock_check(compose->gtkaspell);
+#endif
 	SIGNAL_UNBLOCK(textbuf);
 	
 	cursor_pos = quote_fmt_get_cursor_pos();
@@ -4555,7 +4559,7 @@
 		*par_iter = iter;
 	undo_wrapping(compose->undostruct, FALSE);
 	compose->autowrap = prev_autowrap;
-	
+
 	return modified;
 }
 

Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.243
retrieving revision 1.115.2.244
diff -u -d -r1.115.2.243 -r1.115.2.244
--- main.c	22 Oct 2011 17:09:03 -0000	1.115.2.243
+++ main.c	1 Nov 2011 20:29:31 -0000	1.115.2.244
@@ -2552,7 +2552,7 @@
 				debug_print("Unknown folder: '%s'\n",folder_name);
 		} else {
 			debug_print("%s %s\n",folderItem->name, folderItem->path);
-        }
+		}
 		if (folderItem != NULL) {
 			quicksearch_set(quicksearch, searchType, request);
 			quicksearch_set_recursive(quicksearch, recursive);