Mercurial > pidgin
changeset 693:30a8e386849d
[gaim-migrate @ 703]
does exchanges better
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Wed, 16 Aug 2000 01:10:22 +0000 |
| parents | f4026275bc9f |
| children | 150214f1d48b |
| files | src/oscar.c src/server.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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");