CVS: sylpheed-claws/src folderview.c,1.207.2.91,1.207.2.91.2.1 mainwindow.c,1.274.2.105.2.1,1.274.2.105.2.2

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9772/src

Modified Files:
      Tag: stable_2_1
	folderview.c mainwindow.c 
Log Message:
2006-04-21 [colin]	2.1.1cvs6-stable

	* src/folderview.c
	* src/mainwindow.c
	* src/common/utils.c
		From 2.1.1cvs21
		Fix bug #943 (Incorrectly parsed email address 
		list in short headers on message view and in 
		printouts), and fix occasional folder flicker

Index: folderview.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/folderview.c,v
retrieving revision 1.207.2.91
retrieving revision 1.207.2.91.2.1
diff -u -r1.207.2.91 -r1.207.2.91.2.1
--- folderview.c	29 Mar 2006 16:09:21 -0000	1.207.2.91
+++ folderview.c	21 Apr 2006 16:54:42 -0000	1.207.2.91.2.1
@@ -1863,8 +1863,10 @@
 	}
 	
 	if (!can_select || summary_is_locked(folderview->summaryview)) {
-		gtkut_ctree_set_focus_row(ctree, folderview->opened);
-		gtk_ctree_select(ctree, folderview->opened);
+		if (folderview->opened) {
+			gtkut_ctree_set_focus_row(ctree, folderview->opened);
+			gtk_ctree_select(ctree, folderview->opened);
+		}
 		return;
 	}
 

Index: mainwindow.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/mainwindow.c,v
retrieving revision 1.274.2.105.2.1
retrieving revision 1.274.2.105.2.2
diff -u -r1.274.2.105.2.1 -r1.274.2.105.2.2
--- mainwindow.c	9 Apr 2006 15:38:35 -0000	1.274.2.105.2.1
+++ mainwindow.c	21 Apr 2006 16:54:42 -0000	1.274.2.105.2.2
@@ -3458,10 +3458,13 @@
 		return FALSE;
 	case GDK_space:
 		if (mainwin->folderview && mainwin->summaryview
-		    && !mainwin->summaryview->displayed) {
-			summary_lock(mainwin->summaryview);
+		    && ((!mainwin->summaryview->displayed
+		        && !mainwin->summaryview->selected) 
+			|| (mainwin->summaryview->folder_item
+			    && mainwin->summaryview->folder_item->total_msgs == 0))) {
+			g_signal_stop_emission_by_name(G_OBJECT(widget), 
+                                       "key_press_event");
 			folderview_select_next_unread(mainwin->folderview);
-			summary_unlock(mainwin->summaryview);
 		}
 		break;
 	default:



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642