comparison: src/conversation.c
src/conversation.c
- changeset 7107
- 903864ff76c3
- parent 7088
- 0920bc6160ae
- child 7118
- 280b3b85a28a
equal
deleted
inserted
replaced
| 7106:eaeff5775818 | 7107:903864ff76c3 |
|---|---|
| 217 buf2 = g_malloc(limit); | 217 buf2 = g_malloc(limit); |
| 218 | 218 |
| 219 if ((gc->flags & GAIM_CONNECTION_HTML) && | 219 if ((gc->flags & GAIM_CONNECTION_HTML) && |
| 220 gaim_prefs_get_bool("/core/conversations/send_urls_as_links")) { | 220 gaim_prefs_get_bool("/core/conversations/send_urls_as_links")) { |
| 221 | 221 |
| 222 buffy = linkify_text(buf); | 222 buffy = gaim_markup_linkify(buf); |
| 223 } | 223 } |
| 224 else | 224 else |
| 225 buffy = g_strdup(buf); | 225 buffy = g_strdup(buf); |
| 226 | 226 |
| 227 plugin_return = | 227 plugin_return = |
| 1287 char *cuser; | 1287 char *cuser; |
| 1288 GList *cnv; | 1288 GList *cnv; |
| 1289 | 1289 |
| 1290 g_return_val_if_fail(name != NULL, NULL); | 1290 g_return_val_if_fail(name != NULL, NULL); |
| 1291 | 1291 |
| 1292 cuser = g_strdup(normalize(name)); | 1292 cuser = g_strdup(gaim_normalize(name)); |
| 1293 | 1293 |
| 1294 for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { | 1294 for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { |
| 1295 c = (GaimConversation *)cnv->data; | 1295 c = (GaimConversation *)cnv->data; |
| 1296 | 1296 |
| 1297 if (!gaim_utf8_strcasecmp(cuser, normalize(gaim_conversation_get_name(c)))) | 1297 if (!gaim_utf8_strcasecmp(cuser, gaim_normalize(gaim_conversation_get_name(c)))) |
| 1298 break; | 1298 break; |
| 1299 | 1299 |
| 1300 c = NULL; | 1300 c = NULL; |
| 1301 } | 1301 } |
| 1302 | 1302 |
| 1313 char *cuser; | 1313 char *cuser; |
| 1314 GList *cnv; | 1314 GList *cnv; |
| 1315 | 1315 |
| 1316 g_return_val_if_fail(name != NULL, NULL); | 1316 g_return_val_if_fail(name != NULL, NULL); |
| 1317 | 1317 |
| 1318 cuser = g_strdup(normalize(name)); | 1318 cuser = g_strdup(gaim_normalize(name)); |
| 1319 | 1319 |
| 1320 for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { | 1320 for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { |
| 1321 c = (GaimConversation *)cnv->data; | 1321 c = (GaimConversation *)cnv->data; |
| 1322 | 1322 |
| 1323 if (!gaim_utf8_strcasecmp(cuser, | 1323 if (!gaim_utf8_strcasecmp(cuser, |
| 1324 normalize(gaim_conversation_get_name(c))) && | 1324 gaim_normalize(gaim_conversation_get_name(c))) && |
| 1325 account == gaim_conversation_get_account(c)) { | 1325 account == gaim_conversation_get_account(c)) { |
| 1326 | 1326 |
| 1327 break; | 1327 break; |
| 1328 } | 1328 } |
| 1329 | 1329 |
| 1824 | 1824 |
| 1825 if (!(flags & GAIM_MESSAGE_WHISPER)) { | 1825 if (!(flags & GAIM_MESSAGE_WHISPER)) { |
| 1826 char *str; | 1826 char *str; |
| 1827 const char *disp; | 1827 const char *disp; |
| 1828 | 1828 |
| 1829 str = g_strdup(normalize(who)); | 1829 str = g_strdup(gaim_normalize(who)); |
| 1830 disp = gaim_connection_get_display_name(gc); | 1830 disp = gaim_connection_get_display_name(gc); |
| 1831 | 1831 |
| 1832 if (!gaim_utf8_strcasecmp(str, normalize(gaim_account_get_username(account))) || | 1832 if (!gaim_utf8_strcasecmp(str, gaim_normalize(gaim_account_get_username(account))) || |
| 1833 (disp && !gaim_utf8_strcasecmp(str, normalize(disp)))) { | 1833 (disp && !gaim_utf8_strcasecmp(str, gaim_normalize(disp)))) { |
| 1834 | 1834 |
| 1835 flags |= GAIM_MESSAGE_SEND; | 1835 flags |= GAIM_MESSAGE_SEND; |
| 1836 } | 1836 } |
| 1837 else { | 1837 else { |
| 1838 flags |= GAIM_MESSAGE_RECV; | 1838 flags |= GAIM_MESSAGE_RECV; |
