# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 966388222 0
# Node ID 30a8e386849df273070612cc6ad97fb5234fa011
# Parent  f4026275bc9ff71119c56f8d204169d022c68ffc
[gaim-migrate @ 703]
does exchanges better

committer: Tailor Script <tailor@pidgin.im>

diff -r f4026275bc9f -r 30a8e386849d src/oscar.c
--- a/src/oscar.c	Wed Aug 16 01:00:27 2000 +0000
+++ b/src/oscar.c	Wed Aug 16 01:10:22 2000 +0000
@@ -665,7 +665,7 @@
 			va_end(ap);
 
 			serv_got_chat_invite(roominfo->name,
-					     roominfo->instance,
+					     roominfo->exchange,
 					     userinfo->sn,
 					     msg);
 		} else if (rendtype & AIM_CAPS_SENDFILE) {
diff -r f4026275bc9f -r 30a8e386849d src/server.c
--- a/src/server.c	Wed Aug 16 01:00:27 2000 +0000
+++ b/src/server.c	Wed Aug 16 01:10:22 2000 +0000
@@ -905,7 +905,8 @@
 		gtk_widget_destroy(w2);
 	} else {
 		char *i = (char *)gtk_object_get_user_data(GTK_OBJECT(w2));
-		serv_join_chat(4, i);
+		int id = (int)gtk_object_get_user_data(GTK_OBJECT(w));
+		serv_join_chat(id, i);
 		g_free(i);
 		gtk_widget_destroy(w2);
 	}
@@ -969,8 +970,10 @@
 
 	if (!USE_OSCAR)
 	        gtk_object_set_user_data(GTK_OBJECT(d), (void *)id);
-	else
+	else {
 		gtk_object_set_user_data(GTK_OBJECT(d), (void *)g_strdup(name));
+		gtk_object_set_user_data(GTK_OBJECT(yesbtn), (void *)id);
+	}
 
 
         gtk_window_set_title(GTK_WINDOW(d), "Buddy chat invite");