Mercurial > pidgin
changeset 2002:7c2457745344
[gaim-migrate @ 2012]
invite
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 12 Jun 2001 17:18:21 +0000 |
| parents | 9187e83c8b03 |
| children | ffae8228d63a |
| files | src/gtkimhtml.c src/oscar.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkimhtml.c Tue Jun 12 08:12:41 2001 +0000 +++ b/src/gtkimhtml.c Tue Jun 12 17:18:21 2001 +0000 @@ -635,6 +635,10 @@ imhtml->llheight = 0; imhtml->llascent = 0; + if (GTK_LAYOUT (imhtml)->yoffset < TOP_BORDER) + gdk_window_clear_area (GTK_LAYOUT (imhtml)->bin_window, 0, 0, + imhtml->xsize, TOP_BORDER - GTK_LAYOUT (imhtml)->yoffset); + b = imhtml->bits; while (b) { bit = b->data;
--- a/src/oscar.c Tue Jun 12 08:12:41 2001 +0000 +++ b/src/oscar.c Tue Jun 12 17:18:21 2001 +0000 @@ -1768,11 +1768,14 @@ args = va_arg(ap, struct aim_incomingim_ch2_args *); va_end(ap); if (args->reqclass & AIM_CAPS_CHAT) { + char *name = extract_name(args->info.chat.roominfo.name); serv_got_chat_invite(gc, - args->info.chat.roominfo.name, + name ? name : args->info.chat.roominfo.name, args->info.chat.roominfo.exchange, userinfo->sn, args->info.chat.msg); + if (name) + g_free(name); } else if (args->reqclass & AIM_CAPS_SENDFILE) { } else if (args->reqclass & AIM_CAPS_GETFILE) { /*