[gnome-photos/wip/jimmac/app-icon-redesign: 2/3] Move the location of the symbolic application icon



commit 8251b2cb611f69b30fd88ebfc11397134f68571a
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri Sep 14 15:06:52 2018 +0200

    Move the location of the symbolic application icon
    
    Install the org.gnome.Photos-symbolic.svg symbolic icon in
    $datadir/icons/hicolor/symbolic, instead of its current location at
    $datadir/icons/hicolor/scalable.
    
    https://gitlab.gnome.org/GNOME/gnome-photos/merge_requests/55

 data/icons/Makefile.am                                                | 2 +-
 ...mbolic.svg => hicolor_apps_symbolic_org.gnome.Photos-symbolic.svg} | 0
 data/icons/meson.build                                                | 4 ++--
 meson_post_install.py                                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index fc546730..5dc8a910 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -9,7 +9,7 @@ public_icons = \
        hicolor_apps_32x32_org.gnome.Photos.png \
        hicolor_apps_48x48_org.gnome.Photos.png \
        hicolor_apps_256x256_org.gnome.Photos.png \
-       hicolor_apps_scalable_org.gnome.Photos-symbolic.svg \
+       hicolor_apps_symbolic_org.gnome.Photos-symbolic.svg \
        $(NULL)
 
 noinst_DATA = \
diff --git a/data/icons/hicolor_apps_scalable_org.gnome.Photos-symbolic.svg 
b/data/icons/hicolor_apps_symbolic_org.gnome.Photos-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_scalable_org.gnome.Photos-symbolic.svg
rename to data/icons/hicolor_apps_symbolic_org.gnome.Photos-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
index c33420e8..4994f81b 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -15,6 +15,6 @@ foreach icon_size: icon_sizes
 endforeach
 
 install_data(
-  '_'.join(['hicolor', 'apps', 'scalable', photos_namespace + '-symbolic.svg']),
-  install_dir: join_paths(photos_datadir, 'icons', 'hicolor', 'scalable', 'apps'),
+  '_'.join(['hicolor', 'apps', 'symbolic', photos_namespace + '-symbolic.svg']),
+  install_dir: join_paths(photos_datadir, 'icons', 'hicolor', 'symbolic', 'apps'),
 )
diff --git a/meson_post_install.py b/meson_post_install.py
index 29eb5ca4..6df6a28e 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -15,7 +15,7 @@ else:
 
 icondir = os.path.join(datadir, 'icons', 'hicolor')
 
-name_pattern = re.compile('hicolor_(?:apps)_(?:\d+x\d+|scalable)_(.*)')
+name_pattern = re.compile('hicolor_(?:apps)_(?:\d+x\d+|symbolic)_(.*)')
 search_pattern = '/**/hicolor_*'
 
 for file in glob.glob(icondir + search_pattern, recursive=True):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]