[Gaim-commits] CVS: gaim/src buddy.c,1.261,1.262 prpl.c,1.44,1.45

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

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

Modified Files:
	buddy.c prpl.c 
Log Message:
hi


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- buddy.c	2001/10/25 06:09:53	1.261
+++ buddy.c	2001/10/25 07:03:08	1.262
@@ -1955,11 +1955,11 @@
 	style->font = gdk_font_ref(GTK_WIDGET(bs->label)->style->font);
 	if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle) && (t - b->idle >= 1200)) {
 		style->fg[GTK_STATE_NORMAL].red =
-		  (style->fg[GTK_STATE_NORMAL].red / 3) * 2 + (style->bg[GTK_STATE_NORMAL].red / 3);
+		  (style->fg[GTK_STATE_NORMAL].red / 2) + (style->bg[GTK_STATE_NORMAL].red / 2);
 		style->fg[GTK_STATE_NORMAL].green = 
-		  (style->fg[GTK_STATE_NORMAL].green / 3) * 2 + (style->bg[GTK_STATE_NORMAL].green / 3);
+		  (style->fg[GTK_STATE_NORMAL].green / 2) + (style->bg[GTK_STATE_NORMAL].green / 2);
 		style->fg[GTK_STATE_NORMAL].blue = 
-		  (style->fg[GTK_STATE_NORMAL].blue / 3) * 2 + (style->bg[GTK_STATE_NORMAL].blue / 3);
+		  (style->fg[GTK_STATE_NORMAL].blue / 2) + (style->bg[GTK_STATE_NORMAL].blue / 2);
 	}
 	gtk_widget_set_style(bs->label, style);
 	gtk_style_unref(style);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- prpl.c	2001/10/23 08:15:00	1.44
+++ prpl.c	2001/10/25 07:03:08	1.45
@@ -404,7 +404,8 @@
 	} else if (mn->email_win) {
 		gtk_widget_destroy(mn->email_win);
 		return;
-	}
+	} else
+		return;
 
 	if (mn->email_win) {
 		gtk_label_set_text(GTK_LABEL(mn->email_label), buf);