[nautilus] general: use GdkPixbuf/GIcon interface to set emblems in treeviews

[Cosimo Cecchi <cosimoc src gnome org>]

commit e72391a9cecd0fe11458a6633edde3e800a797aa
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Nov 5 17:25:19 2010 +0100

    general: use GdkPixbuf/GIcon interface to set emblems in treeviews
    
    So that emblems get composited for us also on pixbufs such as
    thumbnails.

 configure.in                     |    2 +-
 src/file-manager/fm-list-model.c |    2 +-
 src/file-manager/fm-tree-model.c |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index 6c9c9ae..4697867 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl ===========================================================================
 m4_define(glib_minver,                 2.27.2)
 m4_define(gnome_desktop_minver,        2.91.0)
 m4_define(pango_minver,                1.1.2)
-m4_define(gtk_minver,                  2.91.3)
+m4_define(gtk_minver,                  2.91.4)
 m4_define(xml_minver,                  2.4.7)
 m4_define(exif_minver,                 0.5.12)
 m4_define(exempi_minver,               1.99.5)
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 306ae5d..e7adfdd 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -311,7 +311,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
 				}
 			}
 
-			gicon = nautilus_file_get_gicon (file, flags);
+			gicon = G_ICON (nautilus_file_get_icon_pixbuf (file, icon_size, TRUE, flags));
 
 			/* render emblems with GEmblemedIcon */
 			parent_file = nautilus_file_get_parent (file);
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index 2003368..69143ea 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -274,8 +274,7 @@ get_menu_icon_for_file (TreeNode *node,
 	int i;
 
 	size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU);
-
-	gicon = nautilus_file_get_gicon (file, flags);
+	gicon = G_ICON (nautilus_file_get_icon_pixbuf (file, size, TRUE, flags));
 
 	i = 0;
 	emblems_to_ignore[i++] = NAUTILUS_FILE_EMBLEM_NAME_TRASH;