comparison 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
comparison
equal deleted inserted replaced
7044:c889aee7bd95 7045:237ad253dd34
3167 g_string_append_printf(text, _("<hr>%s"), info_utf8); 3167 g_string_append_printf(text, _("<hr>%s"), info_utf8);
3168 g_free(info_utf8); 3168 g_free(info_utf8);
3169 } 3169 }
3170 } 3170 }
3171 3171
3172 /* gaim_notify_formatted(gc, NULL, _("Buddy Information"), NULL, text->str, NULL, NULL); */ 3172 gaim_notify_formatted(gc, NULL, _("Buddy Information"), NULL, text->str, NULL, NULL);
3173 gaim_notify_formatted(gc, NULL, _("Below are the results of your search:"), NULL, text->str, NULL, NULL);
3174 g_string_free(text, TRUE); 3173 g_string_free(text, TRUE);
3175 3174
3176 return 1; 3175 return 1;
3177 } 3176 }
3178 3177
3504 gaim_debug(GAIM_DEBUG_MISC, "oscar", 3503 gaim_debug(GAIM_DEBUG_MISC, "oscar",
3505 "no more icons to request\n"); 3504 "no more icons to request\n");
3506 return FALSE; 3505 return FALSE;
3507 } 3506 }
3508 3507
3509 userinfo = aim_locate_finduserinfo((char *)od->requesticon->data); 3508 userinfo = aim_locate_finduserinfo(od->sess, (char *)od->requesticon->data);
3510 if ((userinfo != NULL) && (userinfo->iconcsumlen > 0)) { 3509 if ((userinfo != NULL) && (userinfo->iconcsumlen > 0)) {
3511 aim_bart_request(od->sess, od->requesticon->data, userinfo->iconcsum, userinfo->iconcsumlen); 3510 aim_bart_request(od->sess, od->requesticon->data, userinfo->iconcsum, userinfo->iconcsumlen);
3512 return FALSE; 3511 return FALSE;
3513 } else { 3512 } else {
3514 char *sn = od->requesticon->data; 3513 char *sn = od->requesticon->data;
5354 5353
5355 static char *oscar_tooltip_text(GaimBuddy *b) { 5354 static char *oscar_tooltip_text(GaimBuddy *b) {
5356 GaimConnection *gc = b->account->gc; 5355 GaimConnection *gc = b->account->gc;
5357 struct oscar_data *od = gc->proto_data; 5356 struct oscar_data *od = gc->proto_data;
5358 struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name)); 5357 struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name));
5359 aim_userinfo_t *userinfo = aim_locate_finduserinfo(b->name); 5358 aim_userinfo_t *userinfo = aim_locate_finduserinfo(od->sess, b->name);
5360 gchar *tmp = NULL, *ret = g_strdup(""); 5359 gchar *tmp = NULL, *ret = g_strdup("");
5361 5360
5362 if (GAIM_BUDDY_IS_ONLINE(b)) { 5361 if (GAIM_BUDDY_IS_ONLINE(b)) {
5363 if (isdigit(b->name[0])) { 5362 if (isdigit(b->name[0])) {
5364 char *status; 5363 char *status;
6074 } else { 6073 } else {
6075 GaimBuddy *b = gaim_find_buddy(gc->account, who); 6074 GaimBuddy *b = gaim_find_buddy(gc->account, who);
6076 aim_userinfo_t *userinfo; 6075 aim_userinfo_t *userinfo;
6077 6076
6078 if (b) 6077 if (b)
6079 userinfo = aim_locate_finduserinfo(b->name); 6078 userinfo = aim_locate_finduserinfo(od->sess, b->name);
6080 6079
6081 if (b && userinfo && aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), who) && GAIM_BUDDY_IS_ONLINE(b)) { 6080 if (b && userinfo && aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), who) && GAIM_BUDDY_IS_ONLINE(b)) {
6082 if (userinfo->capabilities & AIM_CAPS_DIRECTIM) { 6081 if (userinfo->capabilities & AIM_CAPS_DIRECTIM) {
6083 pbm = g_new0(struct proto_buddy_menu, 1); 6082 pbm = g_new0(struct proto_buddy_menu, 1);
6084 pbm->label = _("Direct IM"); 6083 pbm->label = _("Direct IM");