Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 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 | 9d7fb0b21d9f |
children | 3d34460ecfd6 |
comparison
equal
deleted
inserted
replaced
12578:6609528f7099 | 12579:5e81ae0736c9 |
---|---|
3057 gtk_list_store_set(ls, &iter, | 3057 gtk_list_store_set(ls, &iter, |
3058 CHAT_USERS_ICON_COLUMN, pixbuf, | 3058 CHAT_USERS_ICON_COLUMN, pixbuf, |
3059 CHAT_USERS_ALIAS_COLUMN, alias, | 3059 CHAT_USERS_ALIAS_COLUMN, alias, |
3060 CHAT_USERS_NAME_COLUMN, name, | 3060 CHAT_USERS_NAME_COLUMN, name, |
3061 CHAT_USERS_FLAGS_COLUMN, flags, | 3061 CHAT_USERS_FLAGS_COLUMN, flags, |
3062 CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, alias), | 3062 CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, name), |
3063 CHAT_USERS_BUDDY_COLUMN, is_buddy, | 3063 CHAT_USERS_BUDDY_COLUMN, is_buddy, |
3064 -1); | 3064 -1); |
3065 } | 3065 } |
3066 | 3066 |
3067 if (pixbuf) | 3067 if (pixbuf) |
3383 if ((buddy2 = gaim_find_buddy(conv->account, name)) != NULL) | 3383 if ((buddy2 = gaim_find_buddy(conv->account, name)) != NULL) |
3384 alias = gaim_buddy_get_contact_alias(buddy2); | 3384 alias = gaim_buddy_get_contact_alias(buddy2); |
3385 | 3385 |
3386 gtk_list_store_set(GTK_LIST_STORE(model), &iter, | 3386 gtk_list_store_set(GTK_LIST_STORE(model), &iter, |
3387 CHAT_USERS_ALIAS_COLUMN, alias, | 3387 CHAT_USERS_ALIAS_COLUMN, alias, |
3388 CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, alias), | |
3389 -1); | 3388 -1); |
3390 } | 3389 } |
3391 g_free(name); | 3390 g_free(name); |
3392 break; | 3391 break; |
3393 } | 3392 } |
4436 } | 4435 } |
4437 if (flags & GAIM_MESSAGE_NICK) | 4436 if (flags & GAIM_MESSAGE_NICK) |
4438 strcpy(color, HIGHLIGHT_COLOR); | 4437 strcpy(color, HIGHLIGHT_COLOR); |
4439 else if (flags & GAIM_MESSAGE_RECV) { | 4438 else if (flags & GAIM_MESSAGE_RECV) { |
4440 if (flags & GAIM_MESSAGE_COLORIZE) { | 4439 if (flags & GAIM_MESSAGE_COLORIZE) { |
4441 GdkColor *col = get_nick_color(gtkconv, alias); | 4440 GdkColor *col = get_nick_color(gtkconv, name); |
4442 | 4441 |
4443 g_snprintf(color, sizeof(color), "#%02X%02X%02X", | 4442 g_snprintf(color, sizeof(color), "#%02X%02X%02X", |
4444 col->red >> 8, col->green >> 8, col->blue >> 8); | 4443 col->red >> 8, col->green >> 8, col->blue >> 8); |
4445 } else | 4444 } else |
4446 strcpy(color, RECV_COLOR); | 4445 strcpy(color, RECV_COLOR); |