comparison: src/conversation.c
src/conversation.c
- changeset 4227
- 5f98b16ed21c
- parent 4208
- e70428fed92c
- child 4228
- 430ed18646e5
equal
deleted
inserted
replaced
| 4226:d6cf18debdfa | 4227:5f98b16ed21c |
|---|---|
| 1738 | 1738 |
| 1739 if (!c->is_chat || !(c->gc->prpl->options & OPT_PROTO_UNIQUE_CHATNAME)) { | 1739 if (!c->is_chat || !(c->gc->prpl->options & OPT_PROTO_UNIQUE_CHATNAME)) { |
| 1740 if (!who) { | 1740 if (!who) { |
| 1741 if (flags & WFLAG_SEND) { | 1741 if (flags & WFLAG_SEND) { |
| 1742 b = find_buddy(c->gc, c->gc->username); | 1742 b = find_buddy(c->gc, c->gc->username); |
| 1743 if (b && strcmp(b->name, b->show)) | 1743 if (get_buddy_alias(b)) |
| 1744 who = b->show; | 1744 who = get_buddy_alias(b); |
| 1745 else if (c->gc->user->alias[0]) | 1745 else if (c->gc->user->alias[0]) |
| 1746 who = c->gc->user->alias; | 1746 who = c->gc->user->alias; |
| 1747 else if (c->gc->displayname[0]) | 1747 else if (c->gc->displayname[0]) |
| 1748 who = c->gc->displayname; | 1748 who = c->gc->displayname; |
| 1749 else | 1749 else |
| 1750 who = c->gc->username; | 1750 who = c->gc->username; |
| 1751 } else { | 1751 } else { |
| 1752 b = find_buddy(c->gc, c->name); | 1752 b = find_buddy(c->gc, c->name); |
| 1753 if (b) | 1753 if (b) |
| 1754 who = b->show; | 1754 who = get_buddy_alias(b); |
| 1755 else | 1755 else |
| 1756 who = c->name; | 1756 who = c->name; |
| 1757 } | 1757 } |
| 1758 } else { | 1758 } else { |
| 1759 b = find_buddy(c->gc, who); | 1759 b = find_buddy(c->gc, who); |
| 1760 if (b) | 1760 if (b) |
| 1761 who = b->show; | 1761 who = get_buddy_alias(b); |
| 1762 } | 1762 } |
| 1763 } | 1763 } |
| 1764 | 1764 |
| 1765 strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime)); | 1765 strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime)); |
| 1766 | 1766 |
| 3216 char *text; | 3216 char *text; |
| 3217 int index; | 3217 int index; |
| 3218 GtkNotebook *nb; | 3218 GtkNotebook *nb; |
| 3219 | 3219 |
| 3220 if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL)) | 3220 if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL)) |
| 3221 text = b->show; | 3221 text = get_buddy_alias(b); |
| 3222 else | 3222 else |
| 3223 text = c->name; | 3223 text = c->name; |
| 3224 | 3224 |
| 3225 if (im_options & OPT_IM_ONE_WINDOW) { | 3225 if (im_options & OPT_IM_ONE_WINDOW) { |
| 3226 nb = GTK_NOTEBOOK(convo_notebook); | 3226 nb = GTK_NOTEBOOK(convo_notebook); |
