From 6345f0bae7aaef2ba75318b10e03a85e7ec1ac4f Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 18 Oct 2016 10:14:10 +0200
Subject: [PATCH] build-finish: Support exporting more than hicolor icons

We really want apps to be able to export e.g. HighContrast icons too.
---
 app/flatpak-builtins-build-finish.c | 2 +-
 tests/make-test-app.sh              | 3 +++
 tests/test-bundle.sh                | 1 +
 tests/test-run.sh                   | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/flatpak-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c
index fb079d76..8f8202ec 100644
--- a/app/flatpak-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@@ -186,7 +186,7 @@ collect_exports (GFile *base, const char *app_id, gboolean is_runtime, GCancella
   g_autoptr(GFile) export = NULL;
   const char *app_paths[] = {
     "share/applications",                 /* Copy desktop files */
-    "share/icons/hicolor",                /* Icons */
+    "share/icons",                        /* Icons */
     "share/dbus-1/services",              /* D-Bus service files */
     "share/gnome-shell/search-providers", /* Search providers */
     NULL,
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index adcfe75b..2a9d44fb 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -29,6 +29,9 @@ EOF
 
 mkdir -p ${DIR}/files/share/icons/hicolor/64x64/apps
 cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/
+cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/hicolor/64x64/apps/dont-export.png
+mkdir -p ${DIR}/files/share/icons/HighContrast/64x64/apps
+cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/icons/HighContrast/64x64/apps/
 
 
 mkdir -p ${DIR}/files/share/app-info/xmls
diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh
index f30c4945..2f44eb76 100755
--- a/tests/test-bundle.sh
+++ b/tests/test-bundle.sh
@@ -52,6 +52,7 @@ assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
 # Ensure Exec key is rewritten
 assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
+assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
 
 # Ensure triggers ran
 assert_has_file $FL_DIR/exports/share/applications/mimeinfo.cache
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 2cedccfa..951288b6 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -45,6 +45,8 @@ assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
 # Ensure Exec key is rewritten
 assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$"
 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
+assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png
+assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
 
 # Ensure triggers ran
 assert_has_file $FL_DIR/exports/share/applications/mimeinfo.cache