nemo-icon-info.c: Stop using gtk_icon_theme_has_icon() - it returns

false negative when attempting to check for icons that have been added
using gtk_icon_theme_append_search_path().  This entire branch of
functionality is considered 'legacy' and not recommended, but for
dropbox emblems, where more than one package may attempt to provide
them, putting them in the (recommended) hicolor icon folder won't
work.

Author: mtwebster

libnemo-private/nemo-icon-info.c

@@ -750,26 +750,6 @@ nemo_icon_get_emblem_size_for_icon_size (guint size)
 	return 0; /* no emblems for smaller sizes */
 }
 
-gboolean
-nemo_icon_theme_can_render (GThemedIcon *icon)
-{
-	GtkIconTheme *icon_theme;
-	const gchar * const *names;
-	gint idx;
-
-	names = g_themed_icon_get_names (icon);
-
-	icon_theme = gtk_icon_theme_get_default ();
-
-	for (idx = 0; names[idx] != NULL; idx++) {
-		if (gtk_icon_theme_has_icon (icon_theme, names[idx])) {
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
 GIcon *
 nemo_user_special_directory_get_gicon (GUserDirectory directory)
 {

libnemo-private/nemo-icon-info.h

@@ -98,7 +98,6 @@ guint nemo_get_desktop_icon_size_for_zoom_level  (NemoZoomLevel  zoom_level);
 gint  nemo_get_icon_size_for_stock_size          (GtkIconSize        size);
 guint nemo_icon_get_emblem_size_for_icon_size    (guint              size);
 
-gboolean nemo_icon_theme_can_render              (GThemedIcon *icon);
 GIcon * nemo_user_special_directory_get_gicon (GUserDirectory directory);
 
 

src/nemo-list-model.c

@@ -368,16 +368,14 @@ nemo_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int colu
 			/* pick only the first emblem we can render for the list view */
 			for (l = emblem_icons; !bad_ratio && l != NULL; l = l->next) {
 				emblem_icon = l->data;
-				if (nemo_icon_theme_can_render (G_THEMED_ICON (emblem_icon))) {
-					emblem = g_emblem_new (emblem_icon);
-					emblemed_icon = g_emblemed_icon_new (gicon, emblem);
+				emblem = g_emblem_new (emblem_icon);
+				emblemed_icon = g_emblemed_icon_new (gicon, emblem);
 
-					g_object_unref (gicon);
-					g_object_unref (emblem);
-					gicon = emblemed_icon;
+				g_object_unref (gicon);
+				g_object_unref (emblem);
+				gicon = emblemed_icon;
 
-					break;
-				}
+				break;
 			}
 
 			g_list_free_full (emblem_icons, g_object_unref);

src/nemo-tree-sidebar-model.c

@@ -298,16 +298,14 @@ get_menu_icon_for_file (TreeNode *node,
 	/* pick only the first emblem we can render for the tree view */
 	for (l = emblem_icons; l != NULL; l = l->next) {
 		emblem_icon = l->data;
-		if (nemo_icon_theme_can_render (G_THEMED_ICON (emblem_icon))) {
-			emblem = g_emblem_new (emblem_icon);
-			emblemed_icon = g_emblemed_icon_new (gicon, emblem);
+		emblem = g_emblem_new (emblem_icon);
+		emblemed_icon = g_emblemed_icon_new (gicon, emblem);
 
-			g_object_unref (gicon);
-			g_object_unref (emblem);
-			gicon = emblemed_icon;
+		g_object_unref (gicon);
+		g_object_unref (emblem);
+		gicon = emblemed_icon;
 
-			break;
-		}
+		break;
 	}
 
 	g_list_free_full (emblem_icons, g_object_unref);