summaryrefslogtreecommitdiff
path: root/src/nautilus-canvas-view-container.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2014-09-07 21:46:15 -0700
committerCosimo Cecchi <cosimoc@gnome.org>2014-09-08 22:07:27 -0700
commita6b88ebde1eb82cf7692bf1c0a161ff6184e9188 (patch)
treecbbe3481218ec0c2aace265924250bf8c0211e7f /src/nautilus-canvas-view-container.c
parent150cfb7a325e7b3668cf4c386a043593a8361ce0 (diff)
downloadnautilus-a6b88ebde1eb82cf7692bf1c0a161ff6184e9188.tar.gz
file: apply emblems in nautilus_file_get_gicon()
We have duplicated code between the views - consolidate it inside nautilus_file_get_gicon().
Diffstat (limited to 'src/nautilus-canvas-view-container.c')
-rw-r--r--src/nautilus-canvas-view-container.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index e8a6efd86..09e3ce6c3 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -58,10 +58,6 @@ nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *contain
NautilusFile *file;
NautilusFileIconFlags flags;
NautilusIconInfo *icon_info;
- GdkPixbuf *pixbuf;
- GIcon *emblemed_icon;
- GEmblem *emblem;
- GList *emblem_icons, *l;
gint scale;
file = (NautilusFile *) data;
@@ -81,34 +77,6 @@ nautilus_canvas_view_container_get_icon_images (NautilusCanvasContainer *contain
scale = gtk_widget_get_scale_factor (GTK_WIDGET (canvas_view));
icon_info = nautilus_file_get_icon (file, size, scale, flags);
- emblem_icons = nautilus_file_get_emblem_icons (file);
-
- /* apply emblems */
- if (emblem_icons != NULL) {
- l = emblem_icons;
-
- emblem = g_emblem_new (l->data);
- pixbuf = nautilus_icon_info_get_pixbuf (icon_info);
- emblemed_icon = g_emblemed_icon_new (G_ICON (pixbuf), emblem);
- g_object_unref (emblem);
-
- for (l = l->next; l != NULL; l = l->next) {
- emblem = g_emblem_new (l->data);
- g_emblemed_icon_add_emblem (G_EMBLEMED_ICON (emblemed_icon),
- emblem);
- g_object_unref (emblem);
- }
-
- g_clear_object (&icon_info);
- icon_info = nautilus_icon_info_lookup (emblemed_icon, size, scale);
-
- g_object_unref (pixbuf);
- g_object_unref (emblemed_icon);
- }
-
- if (emblem_icons != NULL) {
- g_list_free_full (emblem_icons, g_object_unref);
- }
return icon_info;
}