comparison: gtk/gtkconv.c
gtk/gtkconv.c
- changeset 14992
- fcf391bb7391
- parent 14989
- 7d538d3ea6f1
- child 15029
- fb0b186cd9cf
equal
deleted
inserted
replaced
| 14991:130412e283d1 | 14992:fcf391bb7391 |
|---|---|
| 3399 GtkListStore *ls; | 3399 GtkListStore *ls; |
| 3400 GdkPixbuf *pixbuf; | 3400 GdkPixbuf *pixbuf; |
| 3401 GtkTreeIter iter; | 3401 GtkTreeIter iter; |
| 3402 gboolean is_me = FALSE; | 3402 gboolean is_me = FALSE; |
| 3403 gboolean is_buddy; | 3403 gboolean is_buddy; |
| 3404 gchar *alias_key, *name, *alias; | 3404 gchar *tmp, *alias_key, *name, *alias; |
| 3405 int flags; | 3405 int flags; |
| 3406 | 3406 |
| 3407 alias = cb->alias; | 3407 alias = cb->alias; |
| 3408 name = cb->name; | 3408 name = cb->name; |
| 3409 flags = GPOINTER_TO_INT(cb->flags); | 3409 flags = GPOINTER_TO_INT(cb->flags); |
| 3423 if (!strcmp(chat->nick, gaim_normalize(conv->account, old_name != NULL ? old_name : name))) | 3423 if (!strcmp(chat->nick, gaim_normalize(conv->account, old_name != NULL ? old_name : name))) |
| 3424 is_me = TRUE; | 3424 is_me = TRUE; |
| 3425 | 3425 |
| 3426 is_buddy = (gaim_find_buddy(conv->account, name) != NULL); | 3426 is_buddy = (gaim_find_buddy(conv->account, name) != NULL); |
| 3427 | 3427 |
| 3428 alias_key = g_utf8_collate_key(alias, strlen(alias)); | 3428 tmp = g_utf8_casefold(alias, -1); |
| 3429 alias_key = g_utf8_collate_key(tmp, -1); | |
| 3430 g_free(tmp); | |
| 3429 | 3431 |
| 3430 if (is_me) | 3432 if (is_me) |
| 3431 { | 3433 { |
| 3432 GdkColor send_color; | 3434 GdkColor send_color; |
| 3433 gdk_color_parse(SEND_COLOR, &send_color); | 3435 gdk_color_parse(SEND_COLOR, &send_color); |
| 3800 | 3802 |
| 3801 gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); | 3803 gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); |
| 3802 | 3804 |
| 3803 if (!strcmp(normalized_name, gaim_normalize(conv->account, name))) { | 3805 if (!strcmp(normalized_name, gaim_normalize(conv->account, name))) { |
| 3804 const char *alias = name; | 3806 const char *alias = name; |
| 3807 char *tmp; | |
| 3805 char *alias_key = NULL; | 3808 char *alias_key = NULL; |
| 3806 GaimBuddy *buddy2; | 3809 GaimBuddy *buddy2; |
| 3807 | 3810 |
| 3808 if (strcmp(chat->nick, gaim_normalize(conv->account, name))) { | 3811 if (strcmp(chat->nick, gaim_normalize(conv->account, name))) { |
| 3809 /* This user is not me, so look into updating the alias. */ | 3812 /* This user is not me, so look into updating the alias. */ |
| 3810 | 3813 |
| 3811 if ((buddy2 = gaim_find_buddy(conv->account, name)) != NULL) { | 3814 if ((buddy2 = gaim_find_buddy(conv->account, name)) != NULL) { |
| 3812 alias = gaim_buddy_get_contact_alias(buddy2); | 3815 alias = gaim_buddy_get_contact_alias(buddy2); |
| 3813 } | 3816 } |
| 3814 | 3817 |
| 3815 alias_key = g_utf8_collate_key(alias, strlen(alias)); | 3818 tmp = g_utf8_casefold(alias, -1); |
| 3819 alias_key = g_utf8_collate_key(tmp, -1); | |
| 3820 g_free(tmp); | |
| 3816 | 3821 |
| 3817 gtk_list_store_set(GTK_LIST_STORE(model), &iter, | 3822 gtk_list_store_set(GTK_LIST_STORE(model), &iter, |
| 3818 CHAT_USERS_ALIAS_COLUMN, alias, | 3823 CHAT_USERS_ALIAS_COLUMN, alias, |
| 3819 CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, | 3824 CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, |
| 3820 -1); | 3825 -1); |
