Mercurial > pidgin
diff src/conversation.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 | 7fd2fd7c6980 |
children | bf630f7dfdcd |
line wrap: on
line diff
--- a/src/conversation.c Wed Oct 01 05:56:58 2003 +0000 +++ b/src/conversation.c Wed Oct 01 06:17:28 2003 +0000 @@ -219,7 +219,7 @@ if ((gc->flags & GAIM_CONNECTION_HTML) && gaim_prefs_get_bool("/core/conversations/send_urls_as_links")) { - buffy = linkify_text(buf); + buffy = gaim_markup_linkify(buf); } else buffy = g_strdup(buf); @@ -1289,12 +1289,12 @@ g_return_val_if_fail(name != NULL, NULL); - cuser = g_strdup(normalize(name)); + cuser = g_strdup(gaim_normalize(name)); for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { c = (GaimConversation *)cnv->data; - if (!gaim_utf8_strcasecmp(cuser, normalize(gaim_conversation_get_name(c)))) + if (!gaim_utf8_strcasecmp(cuser, gaim_normalize(gaim_conversation_get_name(c)))) break; c = NULL; @@ -1315,13 +1315,13 @@ g_return_val_if_fail(name != NULL, NULL); - cuser = g_strdup(normalize(name)); + cuser = g_strdup(gaim_normalize(name)); for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { c = (GaimConversation *)cnv->data; if (!gaim_utf8_strcasecmp(cuser, - normalize(gaim_conversation_get_name(c))) && + gaim_normalize(gaim_conversation_get_name(c))) && account == gaim_conversation_get_account(c)) { break; @@ -1826,11 +1826,11 @@ char *str; const char *disp; - str = g_strdup(normalize(who)); + str = g_strdup(gaim_normalize(who)); disp = gaim_connection_get_display_name(gc); - if (!gaim_utf8_strcasecmp(str, normalize(gaim_account_get_username(account))) || - (disp && !gaim_utf8_strcasecmp(str, normalize(disp)))) { + if (!gaim_utf8_strcasecmp(str, gaim_normalize(gaim_account_get_username(account))) || + (disp && !gaim_utf8_strcasecmp(str, gaim_normalize(disp)))) { flags |= GAIM_MESSAGE_SEND; }