diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-18 20:49:48 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-14 12:28:48 +0200 |
| commit | b88f11c7af8f45328425594b633144f723c2b276 (patch) | |
| tree | b9acb9c5c162f74147dd27eda42ca461b7debc75 | |
| parent | 6986f1b631d2979ce0af28dc138537eed1a7b26b (diff) | |
| download | caja-b88f11c7af8f45328425594b633144f723c2b276.tar.bz2 caja-b88f11c7af8f45328425594b633144f723c2b276.tar.xz | |
[list-view] don't use NautilusCellRendererPixbufEmblem
http://git.gnome.org/browse/nautilus/commit/?id=69740a3c7fd3a2e1cea99c0dc61b3c735993e4bb
| -rw-r--r-- | src/file-manager/fm-list-view.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index e8eb16a8..10586bd3 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -59,7 +59,6 @@ #include <libcaja-private/caja-tree-view-drag-dest.h> #include <libcaja-private/caja-view-factory.h> #include <libcaja-private/caja-clipboard.h> -#include <libcaja-private/caja-cell-renderer-pixbuf-emblem.h> #include <libcaja-private/caja-cell-renderer-text-ellipsized.h> struct FMListViewDetails @@ -1740,7 +1739,7 @@ create_and_set_up_tree_view (FMListView *view) if (!strcmp (name, "name")) { /* Create the file name column */ - cell = caja_cell_renderer_pixbuf_emblem_new (); + cell = gtk_cell_renderer_pixbuf_new (); view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell; view->details->file_name_column = gtk_tree_view_column_new (); @@ -1764,7 +1763,6 @@ create_and_set_up_tree_view (FMListView *view) gtk_tree_view_column_set_attributes (view->details->file_name_column, cell, "pixbuf", FM_LIST_MODEL_SMALLEST_ICON_COLUMN, - "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN, NULL); cell = gtk_cell_renderer_text_new (); @@ -2734,7 +2732,7 @@ fm_list_view_set_zoom_level (FMListView *view, gboolean always_emit) { int icon_size; - int column, emblem_column; + int column; g_return_if_fail (FM_IS_LIST_VIEW (view)); g_return_if_fail (new_level >= CAJA_ZOOM_LEVEL_SMALLEST && @@ -2760,11 +2758,9 @@ fm_list_view_set_zoom_level (FMListView *view, /* Select correctly scaled icons. */ column = fm_list_model_get_column_id_from_zoom_level (new_level); - emblem_column = fm_list_model_get_emblem_column_id_from_zoom_level (new_level); gtk_tree_view_column_set_attributes (view->details->file_name_column, GTK_CELL_RENDERER (view->details->pixbuf_cell), "pixbuf", column, - "pixbuf_emblem", emblem_column, NULL); /* Scale text. */ |