Mercurial > pidgin.yaz
comparison pidgin/gtksavedstatuses.c @ 15439:a415922e2882
merge of '8f5c72b9dbcf628f35e4674469f97b34f9c6fa2c'
and 'e082ba7b9cfaf0fef0531d0fe9b54af7831f75df'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Sun, 28 Jan 2007 01:24:15 +0000 |
| parents | 29e443e0613f |
| children | d75099d2567e |
comparison
equal
deleted
inserted
replaced
| 15426:c9497aad9fc4 | 15439:a415922e2882 |
|---|---|
| 967 GtkTreeIter *iter, GaimSavedStatusSub *substatus) | 967 GtkTreeIter *iter, GaimSavedStatusSub *substatus) |
| 968 { | 968 { |
| 969 GdkPixbuf *pixbuf; | 969 GdkPixbuf *pixbuf; |
| 970 const char *id = NULL, *name = NULL, *message = NULL; | 970 const char *id = NULL, *name = NULL, *message = NULL; |
| 971 | 971 |
| 972 pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); | 972 pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); |
| 973 if ((pixbuf != NULL) && !gaim_account_is_connected(account)) | 973 if ((pixbuf != NULL) && !gaim_account_is_connected(account)) |
| 974 { | 974 { |
| 975 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); | 975 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
| 976 } | 976 } |
| 977 | 977 |
| 1536 /* Only allow users to select statuses that are flagged as "user settable" */ | 1536 /* Only allow users to select statuses that are flagged as "user settable" */ |
| 1537 if (!gaim_status_type_is_user_settable(status_type)) | 1537 if (!gaim_status_type_is_user_settable(status_type)) |
| 1538 continue; | 1538 continue; |
| 1539 | 1539 |
| 1540 id = gaim_status_type_get_id(status_type); | 1540 id = gaim_status_type_get_id(status_type); |
| 1541 pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, 0.5); | 1541 pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, PIDGIN_PRPL_ICON_MEDIUM); |
| 1542 name = gaim_status_type_get_name(status_type); | 1542 name = gaim_status_type_get_name(status_type); |
| 1543 | 1543 |
| 1544 gtk_list_store_append(dialog->model, &iter); | 1544 gtk_list_store_append(dialog->model, &iter); |
| 1545 gtk_list_store_set(dialog->model, &iter, | 1545 gtk_list_store_set(dialog->model, &iter, |
| 1546 SUBSTATUS_COLUMN_ICON, pixbuf, | 1546 SUBSTATUS_COLUMN_ICON, pixbuf, |