[gtk+] Drop an extra dir from builtin icons

[Matthias Clasen <matthiasc src gnome org>]

commit c2a22feb2736252d95648761e16d0eb3a841bbfb
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 30 16:23:28 2014 -0400

    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                                    |    7 +++----
 gtk/gtkicontheme.c                                 |    2 +-
 .../16x16/actions/gtk-caps-lock-warning.png        |  Bin 275 -> 275 bytes
 .../16x16/actions/gtk-color-picker.png             |  Bin 606 -> 606 bytes
 .../{hicolor => }/16x16/actions/gtk-connect.png    |  Bin 692 -> 692 bytes
 .../{hicolor => }/16x16/actions/gtk-convert.png    |  Bin 677 -> 677 bytes
 .../{hicolor => }/16x16/actions/gtk-disconnect.png |  Bin 715 -> 715 bytes
 .../icons/{hicolor => }/16x16/actions/gtk-edit.png |  Bin 755 -> 755 bytes
 .../{hicolor => }/16x16/actions/gtk-index.png      |  Bin 753 -> 753 bytes
 .../16x16/actions/gtk-orientation-landscape.png    |  Bin 756 -> 756 bytes
 .../16x16/actions/gtk-orientation-portrait.png     |  Bin 543 -> 543 bytes
 .../actions/gtk-orientation-reverse-landscape.png  |  Bin 751 -> 751 bytes
 .../actions/gtk-orientation-reverse-portrait.png   |  Bin 557 -> 557 bytes
 .../{hicolor => }/16x16/actions/gtk-page-setup.png |  Bin 622 -> 622 bytes
 .../16x16/actions/gtk-preferences.png              |  Bin 1014 -> 1014 bytes
 .../16x16/actions/gtk-select-color.png             |  Bin 735 -> 735 bytes
 .../16x16/actions/gtk-select-font.png              |  Bin 706 -> 706 bytes
 .../16x16/actions/gtk-undelete-ltr.png             |  Bin 962 -> 962 bytes
 .../16x16/actions/gtk-undelete-rtl.png             |  Bin 952 -> 952 bytes
 .../{hicolor => }/22x22/actions/gtk-apply.png      |  Bin 1002 -> 1002 bytes
 .../{hicolor => }/22x22/actions/gtk-cancel.png     |  Bin 1067 -> 1067 bytes
 .../icons/{hicolor => }/22x22/actions/gtk-no.png   |  Bin 952 -> 952 bytes
 .../icons/{hicolor => }/22x22/actions/gtk-ok.png   |  Bin 963 -> 963 bytes
 .../icons/{hicolor => }/22x22/actions/gtk-yes.png  |  Bin 1044 -> 1044 bytes
 .../24x24/actions/gtk-caps-lock-warning.png        |  Bin 360 -> 360 bytes
 .../24x24/actions/gtk-color-picker.png             |  Bin 891 -> 891 bytes
 .../{hicolor => }/24x24/actions/gtk-connect.png    |  Bin 946 -> 946 bytes
 .../{hicolor => }/24x24/actions/gtk-convert.png    |  Bin 1413 -> 1413 bytes
 .../{hicolor => }/24x24/actions/gtk-disconnect.png |  Bin 852 -> 852 bytes
 .../icons/{hicolor => }/24x24/actions/gtk-edit.png |  Bin 1120 -> 1120 bytes
 .../{hicolor => }/24x24/actions/gtk-index.png      |  Bin 960 -> 960 bytes
 .../24x24/actions/gtk-orientation-landscape.png    |  Bin 1097 -> 1097 bytes
 .../24x24/actions/gtk-orientation-portrait.png     |  Bin 931 -> 931 bytes
 .../actions/gtk-orientation-reverse-landscape.png  |  Bin 1059 -> 1059 bytes
 .../actions/gtk-orientation-reverse-portrait.png   |  Bin 940 -> 940 bytes
 .../{hicolor => }/24x24/actions/gtk-page-setup.png |  Bin 1081 -> 1081 bytes
 .../24x24/actions/gtk-preferences.png              |  Bin 1691 -> 1691 bytes
 .../24x24/actions/gtk-select-color.png             |  Bin 993 -> 993 bytes
 .../24x24/actions/gtk-select-font.png              |  Bin 1109 -> 1109 bytes
 .../24x24/actions/gtk-undelete-ltr.png             |  Bin 1692 -> 1692 bytes
 .../24x24/actions/gtk-undelete-rtl.png             |  Bin 1722 -> 1722 bytes
 .../32x32/actions/gtk-dnd-multiple.png             |  Bin 1215 -> 1215 bytes
 .../icons/{hicolor => }/32x32/actions/gtk-dnd.png  |  Bin 1349 -> 1349 bytes
 43 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3928411..5fafcab 100644
--- a/gtk/Makefile.am
+++ b/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>" >> $@; \
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 360e244..3e6e2e0 100644
--- a/gtk/gtkicontheme.c
+++ b/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;