[Gaim-commits] CVS: gaim/src buddy_chat.c,1.123,1.124 conversation.c,1.286,1.287 ui.h,1.15,1.16

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21418

Modified Files:
	buddy_chat.c conversation.c ui.h 
Log Message:
runny nose and runny yolk, even if you have a cold still you can cough on my again, i still haven't had my full fill


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- buddy_chat.c	2001/10/03 20:36:33	1.123
+++ buddy_chat.c	2001/10/27 00:12:14	1.124
@@ -1074,7 +1074,7 @@
 	style->font = gdk_font_ref(label->style->font);
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
-	b->unseen = FALSE;
+	b->unseen = 0;
 }
 
 void show_new_buddy_chat(struct conversation *b)

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- conversation.c	2001/10/26 10:11:33	1.286
+++ conversation.c	2001/10/27 00:12:14	1.287
@@ -1597,17 +1597,27 @@
 											(notebook),
 											g_list_index(ws,
 												     c)));
-		GtkStyle *style = gtk_style_new();
+		GtkStyle *style;
+		if ((c->unseen == 2) || ((c->unseen == 1) && !(flags & WFLAG_NICK)))
+			return;
+		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);
 		gdk_font_unref(style->font);
 		style->font = gdk_font_ref(label->style->font);
-		style->fg[0].red = 0xcccc;
-		style->fg[0].green = 0x0000;
-		style->fg[0].blue = 0x0000;
+		if (flags & WFLAG_NICK) {
+			style->fg[0].red = 0x0000;
+			style->fg[0].green = 0x0000;
+			style->fg[0].blue = 0xcccc;
+			c->unseen = 2;
+		} else {
+			style->fg[0].red = 0xcccc;
+			style->fg[0].green = 0x0000;
+			style->fg[0].blue = 0x0000;
+			c->unseen = 1;
+		}
 		gtk_widget_set_style(label, style);
 		gtk_style_unref(style);
-		c->unseen = TRUE;
 	}
 }
 
@@ -2102,7 +2112,7 @@
 	style->font = gdk_font_ref(label->style->font);
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
-	c->unseen = FALSE;
+	c->unseen = 0;
 }
 
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ui.h	2001/10/24 11:07:35	1.15
+++ ui.h	2001/10/27 00:12:14	1.16
@@ -136,7 +136,7 @@
 	GtkWidget *sep2;
 	GtkWidget *menu;
 	GtkWidget *check;
-	gboolean unseen;
+	gint unseen;
 
 	/* stuff used just for chat */
         GList *in_room;