Mercurial > pidgin.yaz
changeset 4478:fa2d74e20a89
[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>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Thu, 30 Jan 2003 19:24:48 +0000 |
| parents | 2ea86ba4670b |
| children | 53723b58fe15 |
| files | src/conversation.c src/gtkconv.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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);