Mercurial > pidgin
changeset 12579:5e81ae0736c9
[gaim-migrate @ 14904]
This should colorize by screen name, not by alias. That way, when an alias conflicts with a screen name, you get different colors. Plus, it keeps a user's color constant even if you alias them or change their alias.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 20 Dec 2005 20:08:36 +0000 |
| parents | 6609528f7099 |
| children | 05b5e6c24ea7 |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Tue Dec 20 12:21:18 2005 +0000 +++ b/src/gtkconv.c Tue Dec 20 20:08:36 2005 +0000 @@ -3059,7 +3059,7 @@ CHAT_USERS_ALIAS_COLUMN, alias, CHAT_USERS_NAME_COLUMN, name, CHAT_USERS_FLAGS_COLUMN, flags, - CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, alias), + CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, name), CHAT_USERS_BUDDY_COLUMN, is_buddy, -1); } @@ -3385,7 +3385,6 @@ gtk_list_store_set(GTK_LIST_STORE(model), &iter, CHAT_USERS_ALIAS_COLUMN, alias, - CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, alias), -1); } g_free(name); @@ -4438,7 +4437,7 @@ strcpy(color, HIGHLIGHT_COLOR); else if (flags & GAIM_MESSAGE_RECV) { if (flags & GAIM_MESSAGE_COLORIZE) { - GdkColor *col = get_nick_color(gtkconv, alias); + GdkColor *col = get_nick_color(gtkconv, name); g_snprintf(color, sizeof(color), "#%02X%02X%02X", col->red >> 8, col->green >> 8, col->blue >> 8);