Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 7107:9220c7490cd1
[gaim-migrate @ 7672]
This is a big one: normalize() -> gaim_normalize, linkify_text() ->
gaim_markup_linkify(), gaim_get_size_string() -> gaim_str_size_to_units(),
and moved clean_pid() to main.c.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Wed, 01 Oct 2003 06:17:28 +0000 |
parents | db6bd3e794d8 |
children | 6faeeecab0dc |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Wed Oct 01 05:56:58 2003 +0000 +++ b/src/protocols/oscar/oscar.c Wed Oct 01 06:17:28 2003 +0000 @@ -1792,10 +1792,10 @@ if (!aim_sncmp(gaim_account_get_username(gaim_connection_get_account(gc)), info->sn)) gaim_connection_set_display_name(gc, info->sn); - bi = g_hash_table_lookup(od->buddyinfo, normalize(info->sn)); + bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(info->sn)); if (!bi) { bi = g_new0(struct buddyinfo, 1); - g_hash_table_insert(od->buddyinfo, g_strdup(normalize(info->sn)), bi); + g_hash_table_insert(od->buddyinfo, g_strdup(gaim_normalize(info->sn)), bi); } bi->typingnot = FALSE; bi->ico_informed = FALSE; @@ -1839,7 +1839,7 @@ while (cur && aim_sncmp((char *)cur->data, info->sn)) cur = cur->next; if (!cur) { - od->requesticon = g_slist_append(od->requesticon, strdup(normalize(info->sn))); + od->requesticon = g_slist_append(od->requesticon, strdup(gaim_normalize(info->sn))); if (od->icontimer) g_source_remove(od->icontimer); od->icontimer = g_timeout_add(500, gaim_icon_timerfunc, gc); @@ -1866,7 +1866,7 @@ serv_got_update(gc, info->sn, 0, 0, 0, 0, 0); - g_hash_table_remove(od->buddyinfo, normalize(info->sn)); + g_hash_table_remove(od->buddyinfo, gaim_normalize(info->sn)); return 1; } @@ -2162,10 +2162,10 @@ struct buddyinfo *bi; const char *iconfile; - bi = g_hash_table_lookup(od->buddyinfo, normalize(userinfo->sn)); + bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(userinfo->sn)); if (!bi) { bi = g_new0(struct buddyinfo, 1); - g_hash_table_insert(od->buddyinfo, g_strdup(normalize(userinfo->sn)), bi); + g_hash_table_insert(od->buddyinfo, g_strdup(gaim_normalize(userinfo->sn)), bi); } if (args->icbmflags & AIM_IMFLAGS_AWAY) @@ -4190,7 +4190,7 @@ GSList *list; for (list=gc->account->deny; (list && aim_sncmp(name, list->data)); list=list->next); if (!list) { - struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(name)); + struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(name)); if (bi && bi->typingnot) { if (typing == GAIM_TYPING) aim_im_sendmtn(od->sess, 0x0001, name, 0x0002); @@ -4227,10 +4227,10 @@ struct stat st; gsize len; - bi = g_hash_table_lookup(od->buddyinfo, normalize(name)); + bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(name)); if (!bi) { bi = g_new0(struct buddyinfo, 1); - g_hash_table_insert(od->buddyinfo, g_strdup(normalize(name)), bi); + g_hash_table_insert(od->buddyinfo, g_strdup(gaim_normalize(name)), bi); } args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES; @@ -5362,7 +5362,7 @@ static char *oscar_tooltip_text(GaimBuddy *b) { GaimConnection *gc = b->account->gc; struct oscar_data *od = gc->proto_data; - struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name)); + struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(b->name)); aim_userinfo_t *userinfo = aim_locate_finduserinfo(od->sess, b->name); gchar *tmp = NULL, *ret = g_strdup(""); @@ -5458,7 +5458,7 @@ else ret = g_strdup(_("Away")); } else if (GAIM_BUDDY_IS_ONLINE(b)) { - struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, normalize(b->name)); + struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(b->name)); if (bi->availmsg) ret = g_markup_escape_text(bi->availmsg, strlen(bi->availmsg)); } else {