Mercurial > pidgin.yaz

comparison libpurple/conversation.c @ 18050:2f9eabdc6011

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head dcdd8dc5d40cafef802a88f3f713ee1589bc9c41) to branch 'im.pidgin.pidgin.2.1.0' (head b13966c1f1b76ef136a61969fc8bcc68f02b138c)
author Sean Egan <seanegan@gmail.com>
date Wed, 06 Jun 2007 00:23:41 +0000
parents 6b7b13adb9b1 4b18cc7b6177
children 627f9d40ca1b
comparison
equal deleted inserted replaced
18047:82d68fedbd77 18050:2f9eabdc6011
1538 const char *alias = user; 1538 const char *alias = user;
1539 gboolean quiet; 1539 gboolean quiet;
1540 PurpleConvChatBuddyFlags flag = GPOINTER_TO_INT(fl->data); 1540 PurpleConvChatBuddyFlags flag = GPOINTER_TO_INT(fl->data);
1541 const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL); 1541 const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL);
1542 1542
1543 if (!strcmp(chat->nick, purple_normalize(conv->account, user))) { 1543 if(!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
1544 const char *alias2 = purple_account_get_alias(conv->account); 1544 if (!strcmp(chat->nick, purple_normalize(conv->account, user))) {
1545 if (alias2 != NULL) 1545 const char *alias2 = purple_account_get_alias(conv->account);
1546 alias = alias2; 1546 if (alias2 != NULL)
1547 else 1547 alias = alias2;
1548 { 1548 else
1549 const char *display_name = purple_connection_get_display_name(gc); 1549 {
1550 if (display_name != NULL) 1550 const char *display_name = purple_connection_get_display_name(gc);
1551 alias = display_name; 1551 if (display_name != NULL)
1552 alias = display_name;
1553 }
1554 } else {
1555 PurpleBuddy *buddy;
1556 if ((buddy = purple_find_buddy(gc->account, user)) != NULL)
1557 alias = purple_buddy_get_contact_alias(buddy);
1552 } 1558 }
1553 } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
1554 PurpleBuddy *buddy;
1555 if ((buddy = purple_find_buddy(gc->account, user)) != NULL)
1556 alias = purple_buddy_get_contact_alias(buddy);
1557 } 1559 }
1558 1560
1559 quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), 1561 quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(),
1560 "chat-buddy-joining", conv, user, flag)) | 1562 "chat-buddy-joining", conv, user, flag)) |
1561 purple_conv_chat_is_user_ignored(chat, user); 1563 purple_conv_chat_is_user_ignored(chat, user);
1638 const char *alias; 1640 const char *alias;
1639 1641
1640 /* Note this for later. */ 1642 /* Note this for later. */
1641 is_me = TRUE; 1643 is_me = TRUE;
1642 1644
1643 alias = purple_account_get_alias(conv->account); 1645 if(!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
1644 if (alias != NULL) 1646 alias = purple_account_get_alias(conv->account);
1645 new_alias = alias; 1647 if (alias != NULL)
1646 else 1648 new_alias = alias;
1647 { 1649 else
1648 const char *display_name = purple_connection_get_display_name(gc); 1650 {
1649 if (display_name != NULL) 1651 const char *display_name = purple_connection_get_display_name(gc);
1650 alias = display_name; 1652 if (display_name != NULL)
1653 alias = display_name;
1654 }
1651 } 1655 }
1652 } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { 1656 } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
1653 PurpleBuddy *buddy; 1657 PurpleBuddy *buddy;
1654 if ((buddy = purple_find_buddy(gc->account, new_user)) != NULL) 1658 if ((buddy = purple_find_buddy(gc->account, new_user)) != NULL)
1655 new_alias = purple_buddy_get_contact_alias(buddy); 1659 new_alias = purple_buddy_get_contact_alias(buddy);