# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 992366301 0
# Node ID 7c245774534411ea1eb71b2da3013ef47fa1ede3
# Parent  9187e83c8b030936f9d5b3bfb20cbf6dedc07aa0
[gaim-migrate @ 2012]
invite

committer: Tailor Script <tailor@pidgin.im>

diff -r 9187e83c8b03 -r 7c2457745344 src/gtkimhtml.c
--- 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;
diff -r 9187e83c8b03 -r 7c2457745344 src/oscar.c
--- 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) {
 			/*