[Gaim-commits] CVS: gaim/src gtkconv.c,1.550,1.551

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25305/src

Modified Files:
	gtkconv.c 
Log Message:
Will (resiak) Thompson fixed control-tab


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -d -p -r1.550 -r1.551
--- gtkconv.c	1 May 2005 14:00:37 -0000	1.550
+++ gtkconv.c	2 May 2005 17:49:37 -0000	1.551
@@ -1591,35 +1591,39 @@ move_to_next_unread_tab(GaimGtkConversat
 	GaimGtkConversation *next_gtkconv = NULL;
 	GaimConvWindow *win;
 	GList *l;
-	int index, i;
+	int index, i, found = 0;
 
 	win   = gaim_conversation_get_window(gtkconv->active_conv);
 	index = gtk_notebook_page_num(GTK_NOTEBOOK(GAIM_GTK_WINDOW(win)->notebook), gtkconv->tab_cont);
 
 	/* First check the tabs after this position. */
-	for (i = index; (next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, i)); i++) {
+	for (i = index; !found && (next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, i)); i++) {
 		for (l = next_gtkconv->convs; l; l = l->next) {
 			GaimConversation *c = l->data;
 			if (gaim_conversation_get_unseen(c) > 0)
+			{
+				found = 1;
 				break;
+			}
 		}
 	}
-
-	if (next_gtkconv == NULL) {
-
-		/* Now check before this position. */
-		for (i = index; i >= 0 && (next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, i)); i--) {
+	
+	if (!found) {
+		/* Now check from the beginning up to this position. */
+		for (i = 0; !found && i < index && (next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, i)); i++) {
 			for (l = next_gtkconv->convs; l; l = l->next) {
 				GaimConversation *c = l->data;
-				if (gaim_conversation_get_unseen(c) > 0)
+				if (gaim_conversation_get_unseen(c) > 0) {
+					found = 1;
 					break;
+				}
 			}
 		}
 
-		if (next_gtkconv == NULL) {
+		if (!found) {
 			/* Okay, just grab the next conversation tab. */
 			if (!(next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, index + 1)))
-				next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, index - 1);
+				next_gtkconv = gaim_gtk_get_gtkconv_at_index(win, 0);
 				
 		}
 	}