comparison: libpurple/conversation.c
libpurple/conversation.c
- branch
- next.minor
- changeset 25859
- b42be7bb9dac
- parent 24955
- 77727fac30c6
- child 26047
- a7c475364465
- child 26752
- 27fe5aa7cbd0
equal
deleted
inserted
replaced
| 25857:f40a2e40f651 | 25859:b42be7bb9dac |
|---|---|
| 910 b = purple_find_buddy(account, | 910 b = purple_find_buddy(account, |
| 911 purple_account_get_username(account)); | 911 purple_account_get_username(account)); |
| 912 | 912 |
| 913 if (purple_account_get_alias(account) != NULL) | 913 if (purple_account_get_alias(account) != NULL) |
| 914 alias = account->alias; | 914 alias = account->alias; |
| 915 else if (b != NULL && strcmp(purple_buddy_get_name(b), purple_buddy_get_contact_alias(b))) | 915 else if (b != NULL && !purple_strequal(purple_buddy_get_name(b), purple_buddy_get_contact_alias(b))) |
| 916 alias = purple_buddy_get_contact_alias(b); | 916 alias = purple_buddy_get_contact_alias(b); |
| 917 else if (purple_connection_get_display_name(gc) != NULL) | 917 else if (purple_connection_get_display_name(gc) != NULL) |
| 918 alias = purple_connection_get_display_name(gc); | 918 alias = purple_connection_get_display_name(gc); |
| 919 else | 919 else |
| 920 alias = purple_account_get_username(account); | 920 alias = purple_account_get_username(account); |
| 1478 if (!(flags & PURPLE_MESSAGE_WHISPER)) { | 1478 if (!(flags & PURPLE_MESSAGE_WHISPER)) { |
| 1479 char *str; | 1479 char *str; |
| 1480 | 1480 |
| 1481 str = g_strdup(purple_normalize(account, who)); | 1481 str = g_strdup(purple_normalize(account, who)); |
| 1482 | 1482 |
| 1483 if (!strcmp(str, purple_normalize(account, chat->nick))) { | 1483 if (purple_strequal(str, purple_normalize(account, chat->nick))) { |
| 1484 flags |= PURPLE_MESSAGE_SEND; | 1484 flags |= PURPLE_MESSAGE_SEND; |
| 1485 } else { | 1485 } else { |
| 1486 flags |= PURPLE_MESSAGE_RECV; | 1486 flags |= PURPLE_MESSAGE_RECV; |
| 1487 | 1487 |
| 1488 if (purple_utf8_has_word(message, chat->nick)) | 1488 if (purple_utf8_has_word(message, chat->nick)) |
| 1599 gboolean quiet; | 1599 gboolean quiet; |
| 1600 PurpleConvChatBuddyFlags flag = GPOINTER_TO_INT(fl->data); | 1600 PurpleConvChatBuddyFlags flag = GPOINTER_TO_INT(fl->data); |
| 1601 const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL); | 1601 const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL); |
| 1602 | 1602 |
| 1603 if(!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { | 1603 if(!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { |
| 1604 if (!strcmp(chat->nick, purple_normalize(conv->account, user))) { | 1604 if (purple_strequal(chat->nick, purple_normalize(conv->account, user))) { |
| 1605 const char *alias2 = purple_account_get_alias(conv->account); | 1605 const char *alias2 = purple_account_get_alias(conv->account); |
| 1606 if (alias2 != NULL) | 1606 if (alias2 != NULL) |
| 1607 alias = alias2; | 1607 alias = alias2; |
| 1608 else | 1608 else |
| 1609 { | 1609 { |
| 1690 gc = purple_conversation_get_gc(conv); | 1690 gc = purple_conversation_get_gc(conv); |
| 1691 g_return_if_fail(gc != NULL); | 1691 g_return_if_fail(gc != NULL); |
| 1692 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); | 1692 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1693 g_return_if_fail(prpl_info != NULL); | 1693 g_return_if_fail(prpl_info != NULL); |
| 1694 | 1694 |
| 1695 if (!strcmp(chat->nick, purple_normalize(conv->account, old_user))) { | 1695 if (purple_strequal(chat->nick, purple_normalize(conv->account, old_user))) { |
| 1696 const char *alias; | 1696 const char *alias; |
| 1697 | 1697 |
| 1698 /* Note this for later. */ | 1698 /* Note this for later. */ |
| 1699 is_me = TRUE; | 1699 is_me = TRUE; |
| 1700 | 1700 |
