Drop an extra dir from builtin icons

Make icon lookup from resources work without the extra hicolor
component in the path. It is redundant, since we always treat
builtin icons as part of hicolor anyway.

gtk/Makefile.am

@@ -1278,8 +1278,7 @@ gtk_extra_sources =				\
 MAINTAINERCLEANFILES = \
 	$(gtk_built_sources) 			\
 	$(gtk_dbus_built_sources)		\
-	$(stamp_files) 				\
-	stock-icons/icon-theme.cache
+	$(stamp_files)
 
 DISTCLEANFILES =
 
@@ -1401,9 +1400,9 @@ gtk.gresource.xml: Makefile.am
 	  echo -e "    <file compressed=\"true\">ui/$$n</file>" >> $@; \
 	done; \
 	for s in 16x16 22x22 24x24 32x32; do \
-	  for f in $(srcdir)/resources/icons/hicolor/$$s/actions/*.png; do \
+	  for f in $(srcdir)/resources/icons/$$s/actions/*.png; do \
 	    n=`basename $$f`; \
-	    echo -e "    <file>icons/hicolor/$$s/actions/$$n</file>" >> $@; \
+	    echo -e "    <file>icons/$$s/actions/$$n</file>" >> $@; \
 	  done; \
 	done; \
 	echo -e "  </gresource>" >> $@; \

gtk/gtkicontheme.c

@@ -3265,7 +3265,7 @@ theme_subdir_load (GtkIconTheme *icon_theme,
     { 
       for (d = icon_theme->priv->resource_paths; d; d = d->next)
         {
-          full_dir = g_build_filename ((const gchar *)d->data, theme->name, subdir, NULL);
+          full_dir = g_build_filename ((const gchar *)d->data, subdir, NULL);
           dir = g_new0 (IconThemeDir, 1);
           dir->type = type;
           dir->is_resource = TRUE;