[gtk/wip/jimmac/app-icons] Fix icon installation

[Matthias Clasen <matthiasc src gnome org>]

commit a72b91ec94450cb51c4452d84792ab87fc795687
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Feb 8 21:38:14 2019 -0500

    Fix icon installation
    
    This makes the apps pick up their awesome new icons.

 demos/gtk-demo/data/scalable/{ => apps}/org.gtk.Demo.svg         | 0
 .../gtk-demo/data/symbolic/{ => apps}/org.gtk.Demo-symbolic.svg  | 0
 demos/gtk-demo/meson.build                                       | 4 ++--
 .../data/scalable/{ => apps}/org.gnome.IconBrowser.svg           | 0
 .../data/symbolic/{ => apps}/org.gtk.IconBrowser-symbolic.svg    | 0
 demos/icon-browser/meson.build                                   | 9 +++++++++
 .../data/scalable/{ => apps}/org.gtk.WidgetFactory.svg           | 0
 .../data/symbolic/{ => apps}/org.gtk.WidgetFactory-symbolic.svg  | 0
 demos/widget-factory/meson.build                                 | 2 +-
 9 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/demos/gtk-demo/data/scalable/org.gtk.Demo.svg 
b/demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg
similarity index 100%
rename from demos/gtk-demo/data/scalable/org.gtk.Demo.svg
rename to demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg
diff --git a/demos/gtk-demo/data/symbolic/org.gtk.Demo-symbolic.svg 
b/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
similarity index 100%
rename from demos/gtk-demo/data/symbolic/org.gtk.Demo-symbolic.svg
rename to demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 29efa1d290..7116a411e2 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -99,7 +99,7 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
                                             source_dir: '.')
 
 executable('gtk4-demo',
-                   demos, demos_h, extra_demo_sources, gtkdemo_resources,
+           demos, demos_h, extra_demo_sources, gtkdemo_resources,
            c_args: gtkdemo_args,
            dependencies: gtkdemo_deps,
            include_directories: confinc,
@@ -120,7 +120,7 @@ executable('gtk4-demo-application',
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
 
 foreach size: ['scalable', 'symbolic']
-  install_subdir('hicolor/' + size,
+  install_subdir('data/' + size,
     install_dir: icontheme_dir
   )
 endforeach
diff --git a/demos/icon-browser/data/scalable/org.gnome.IconBrowser.svg 
b/demos/icon-browser/data/scalable/apps/org.gnome.IconBrowser.svg
similarity index 100%
rename from demos/icon-browser/data/scalable/org.gnome.IconBrowser.svg
rename to demos/icon-browser/data/scalable/apps/org.gnome.IconBrowser.svg
diff --git a/demos/icon-browser/data/symbolic/org.gtk.IconBrowser-symbolic.svg 
b/demos/icon-browser/data/symbolic/apps/org.gtk.IconBrowser-symbolic.svg
similarity index 100%
rename from demos/icon-browser/data/symbolic/org.gtk.IconBrowser-symbolic.svg
rename to demos/icon-browser/data/symbolic/apps/org.gtk.IconBrowser-symbolic.svg
diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build
index fcaca82d8d..3708fa047a 100644
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -18,3 +18,12 @@ executable('gtk4-icon-browser',
            install: true)
 
 install_data('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
diff --git a/demos/widget-factory/data/scalable/org.gtk.WidgetFactory.svg 
b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg
similarity index 100%
rename from demos/widget-factory/data/scalable/org.gtk.WidgetFactory.svg
rename to demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg
diff --git a/demos/widget-factory/data/symbolic/org.gtk.WidgetFactory-symbolic.svg 
b/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg
similarity index 100%
rename from demos/widget-factory/data/symbolic/org.gtk.WidgetFactory-symbolic.svg
rename to demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg
diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index 50aff7f1c7..c1ba9ec564 100644
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -19,7 +19,7 @@ install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
 
 foreach size: ['scalable', 'symbolic']
-  install_subdir('hicolor/' + size,
+  install_subdir('data/' + size,
     install_dir: icontheme_dir
   )
 endforeach