comparison: pidgin/gtkaccount.c
pidgin/gtkaccount.c
- changeset 15496
- 76b5ca00a36c
- parent 15435
- 4b933b06d75e
- child 15497
- 92f02f4bd5ee
equal
deleted
inserted
replaced
| 15495:105fdac48813 | 15496:76b5ca00a36c |
|---|---|
| 1561 g_object_unref(G_OBJECT(pulse_data->online_pixbuf)); | 1561 g_object_unref(G_OBJECT(pulse_data->online_pixbuf)); |
| 1562 | 1562 |
| 1563 g_free(pulse_data); | 1563 g_free(pulse_data); |
| 1564 } | 1564 } |
| 1565 | 1565 |
| 1566 pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); | 1566 pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); |
| 1567 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) | 1567 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) |
| 1568 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); | 1568 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
| 1569 | 1569 |
| 1570 gtk_list_store_set(accounts_window->model, &iter, | 1570 gtk_list_store_set(accounts_window->model, &iter, |
| 1571 COLUMN_ICON, pixbuf, | 1571 COLUMN_ICON, pixbuf, |
| 1940 column = gtk_tree_view_column_new(); | 1940 column = gtk_tree_view_column_new(); |
| 1941 gtk_tree_view_column_set_title(column, _("Screen Name")); | 1941 gtk_tree_view_column_set_title(column, _("Screen Name")); |
| 1942 gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); | 1942 gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); |
| 1943 gtk_tree_view_column_set_resizable(column, TRUE); | 1943 gtk_tree_view_column_set_resizable(column, TRUE); |
| 1944 | 1944 |
| 1945 /* Status Icon */ | 1945 /* Buddy Icon */ |
| 1946 renderer = gtk_cell_renderer_pixbuf_new(); | 1946 renderer = gtk_cell_renderer_pixbuf_new(); |
| 1947 gtk_tree_view_column_pack_start(column, renderer, FALSE); | 1947 gtk_tree_view_column_pack_start(column, renderer, FALSE); |
| 1948 gtk_tree_view_column_add_attribute(column, renderer, | 1948 gtk_tree_view_column_add_attribute(column, renderer, |
| 1949 "pixbuf", COLUMN_BUDDYICON); | 1949 "pixbuf", COLUMN_BUDDYICON); |
| 1950 | 1950 |
| 1980 const char *path; | 1980 const char *path; |
| 1981 GdkPixbuf *pixbuf; | 1981 GdkPixbuf *pixbuf; |
| 1982 GdkPixbuf *statusicon_pixbuf; | 1982 GdkPixbuf *statusicon_pixbuf; |
| 1983 GdkPixbuf *statusicon_pixbuf_scaled; | 1983 GdkPixbuf *statusicon_pixbuf_scaled; |
| 1984 | 1984 |
| 1985 pixbuf = gaim_gtk_create_prpl_icon(account, 0.5); | 1985 pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); |
| 1986 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) | 1986 if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) |
| 1987 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); | 1987 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
| 1988 | 1988 |
| 1989 if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE)) | 1989 if (gaim_account_get_bool(account, "use-global-buddyicon", TRUE)) |
| 1990 path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"); | 1990 path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon"); |
| 1994 statusicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); | 1994 statusicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); |
| 1995 else | 1995 else |
| 1996 statusicon_pixbuf = NULL; | 1996 statusicon_pixbuf = NULL; |
| 1997 | 1997 |
| 1998 if (statusicon_pixbuf) { | 1998 if (statusicon_pixbuf) { |
| 1999 statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 16, 16, GDK_INTERP_HYPER); | 1999 statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 22, 22, GDK_INTERP_HYPER); |
| 2000 } else { | 2000 } else { |
| 2001 statusicon_pixbuf_scaled = NULL; | 2001 statusicon_pixbuf_scaled = NULL; |
| 2002 } | 2002 } |
| 2003 | 2003 |
| 2004 gtk_list_store_set(store, iter, | 2004 gtk_list_store_set(store, iter, |
