# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1043954688 0
# Node ID fa2d74e20a898332b031914fe4d3c24f9e389bb2
# Parent  2ea86ba4670b8b88f7a2543dc83d14f2a6a66850
[gaim-migrate @ 4753]
grp2 is already defined in the windows header file, so I renamed it.
Also, we're now opening buddy icon files for writing with "wb" instead of
"w". Thanks Herman.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2ea86ba4670b -r fa2d74e20a89 src/conversation.c
--- a/src/conversation.c	Thu Jan 30 18:55:17 2003 +0000
+++ b/src/conversation.c	Thu Jan 30 19:24:48 2003 +0000
@@ -2084,7 +2084,7 @@
 			struct gaim_window *win2;
 			struct gaim_conversation *conv2;
 			struct buddy *b2;
-			struct group *grp2 = NULL;
+			struct group *g2 = NULL;
 
 			win2 = (struct gaim_window *)wins->data;
 
@@ -2098,9 +2098,9 @@
 								gaim_conversation_get_name(conv2));
 
 				if (b2 != NULL)
-					grp2 = find_group_by_buddy(b2);
-
-				if (grp == grp2) {
+					g2 = find_group_by_buddy(b2);
+
+				if (grp == g2) {
 					gaim_window_add_conversation(win2, conv);
 
 					return;
diff -r 2ea86ba4670b -r fa2d74e20a89 src/gtkconv.c
--- a/src/gtkconv.c	Thu Jan 30 18:55:17 2003 +0000
+++ b/src/gtkconv.c	Thu Jan 30 19:24:48 2003 +0000
@@ -4508,7 +4508,7 @@
 			   "%s" G_DIR_SEPARATOR_S "gaimicon-%s.%d",
 			   g_get_tmp_dir(), gaim_conversation_get_name(conv), getpid());
 
-	if (!(file = fopen(filename, "w")))
+	if (!(file = fopen(filename, "wb")))
 		return;
 
 	fwrite(data, 1, len, file);