Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 7045:237ad253dd34
[gaim-migrate @ 7608]
This should fix SimGuy's problem and maybe the problem Luke had
earlier. I don't know what I was thinking with the static variables.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 30 Sep 2003 01:32:29 +0000 |
| parents | 1ab06a680ac2 |
| children | 7c04a0775918 |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Tue Sep 30 00:39:24 2003 +0000 +++ b/src/protocols/oscar/oscar.c Tue Sep 30 01:32:29 2003 +0000 @@ -3169,8 +3169,7 @@ } } - /* gaim_notify_formatted(gc, NULL, _("Buddy Information"), NULL, text->str, NULL, NULL); */ - gaim_notify_formatted(gc, NULL, _("Below are the results of your search:"), NULL, text->str, NULL, NULL); + gaim_notify_formatted(gc, NULL, _("Buddy Information"), NULL, text->str, NULL, NULL); g_string_free(text, TRUE); return 1; @@ -3506,7 +3505,7 @@ return FALSE; } - userinfo = aim_locate_finduserinfo((char *)od->requesticon->data); + userinfo = aim_locate_finduserinfo(od->sess, (char *)od->requesticon->data); if ((userinfo != NULL) && (userinfo->iconcsumlen > 0)) { aim_bart_request(od->sess, od->requesticon->data, userinfo->iconcsum, userinfo->iconcsumlen); return FALSE; @@ -5356,7 +5355,7 @@ GaimConnection *gc = b->account->gc; struct oscar_data *od = gc->proto_data; struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name)); - aim_userinfo_t *userinfo = aim_locate_finduserinfo(b->name); + aim_userinfo_t *userinfo = aim_locate_finduserinfo(od->sess, b->name); gchar *tmp = NULL, *ret = g_strdup(""); if (GAIM_BUDDY_IS_ONLINE(b)) { @@ -6076,7 +6075,7 @@ aim_userinfo_t *userinfo; if (b) - userinfo = aim_locate_finduserinfo(b->name); + userinfo = aim_locate_finduserinfo(od->sess, b->name); if (b && userinfo && aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), who) && GAIM_BUDDY_IS_ONLINE(b)) { if (userinfo->capabilities & AIM_CAPS_DIRECTIM) {