diff options
author | Jeremy Bicha <jeremy@bicha.net> | 2018-02-26 13:10:59 +0000 |
---|---|---|
committer | Jeremy Bicha <jeremy@bicha.net> | 2018-02-26 13:10:59 +0000 |
commit | edf3bfe79093ec89becf2ce4875503a436571cb7 (patch) | |
tree | 02bdd3282a957ff831baf67ad7bb1fc4def641fc | |
parent | 893d0955a5e534e4abbb9a84aaf05cffccc55812 (diff) | |
parent | 29b3a93f765e0ec15879a26ba67e30f779abda4e (diff) | |
download | gnome-control-center-edf3bfe79093ec89becf2ce4875503a436571cb7.tar.gz |
Merge branch 'fix-app-icon-install' into 'master'
build: Fix app icon install
See merge request GNOME/gnome-control-center!3
-rw-r--r-- | data/icons/hicolor/16x16/apps/gnome-control-center.png (renamed from data/icons/hicolor_apps_16x16_gnome-control-center.png) | bin | 819 -> 819 bytes | |||
-rw-r--r-- | data/icons/hicolor/24x24/apps/gnome-control-center.png (renamed from data/icons/hicolor_apps_24x24_gnome-control-center.png) | bin | 1168 -> 1168 bytes | |||
-rw-r--r-- | data/icons/hicolor/32x32/apps/gnome-control-center.png (renamed from data/icons/hicolor_apps_32x32_gnome-control-center.png) | bin | 2044 -> 2044 bytes | |||
-rw-r--r-- | data/icons/hicolor/48x48/apps/gnome-control-center.png (renamed from data/icons/hicolor_apps_48x48_gnome-control-center.png) | bin | 3257 -> 3257 bytes | |||
-rw-r--r-- | data/icons/hicolor/512x512/apps/gnome-control-center.png (renamed from data/icons/hicolor_apps_512x512_gnome-control-center.png) | bin | 111227 -> 111227 bytes | |||
-rw-r--r-- | data/icons/hicolor/scalable/apps/gnome-control-center-symbolic.svg (renamed from data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg) | 0 | ||||
-rw-r--r-- | data/icons/meson.build | 21 |
7 files changed, 3 insertions, 18 deletions
diff --git a/data/icons/hicolor_apps_16x16_gnome-control-center.png b/data/icons/hicolor/16x16/apps/gnome-control-center.png Binary files differindex 202670c8e..202670c8e 100644 --- a/data/icons/hicolor_apps_16x16_gnome-control-center.png +++ b/data/icons/hicolor/16x16/apps/gnome-control-center.png diff --git a/data/icons/hicolor_apps_24x24_gnome-control-center.png b/data/icons/hicolor/24x24/apps/gnome-control-center.png Binary files differindex 0bc2ebfd2..0bc2ebfd2 100644 --- a/data/icons/hicolor_apps_24x24_gnome-control-center.png +++ b/data/icons/hicolor/24x24/apps/gnome-control-center.png diff --git a/data/icons/hicolor_apps_32x32_gnome-control-center.png b/data/icons/hicolor/32x32/apps/gnome-control-center.png Binary files differindex 77076b9dc..77076b9dc 100644 --- a/data/icons/hicolor_apps_32x32_gnome-control-center.png +++ b/data/icons/hicolor/32x32/apps/gnome-control-center.png diff --git a/data/icons/hicolor_apps_48x48_gnome-control-center.png b/data/icons/hicolor/48x48/apps/gnome-control-center.png Binary files differindex df687d1fd..df687d1fd 100644 --- a/data/icons/hicolor_apps_48x48_gnome-control-center.png +++ b/data/icons/hicolor/48x48/apps/gnome-control-center.png diff --git a/data/icons/hicolor_apps_512x512_gnome-control-center.png b/data/icons/hicolor/512x512/apps/gnome-control-center.png Binary files differindex 4294e4502..4294e4502 100644 --- a/data/icons/hicolor_apps_512x512_gnome-control-center.png +++ b/data/icons/hicolor/512x512/apps/gnome-control-center.png diff --git a/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg b/data/icons/hicolor/scalable/apps/gnome-control-center-symbolic.svg index d49ea7909..d49ea7909 100644 --- a/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg +++ b/data/icons/hicolor/scalable/apps/gnome-control-center-symbolic.svg diff --git a/data/icons/meson.build b/data/icons/meson.build index 56fa96791..0f9a7eb54 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,19 +1,4 @@ -icon_sizes = [ - '16x16', - '24x24', - '32x32', - '48x48', - '512x512' -] - -foreach icon_size: icon_sizes - install_data( - '_'.join(['hicolor', 'apps', icon_size, 'gnome-control-center.png']), - install_dir: join_paths(control_center_icondir, 'hicolor', icon_size, 'apps') - ) -endforeach - -install_data( - 'hicolor_apps_symbolic_gnome-control-center-symbolic.svg', - install_dir: join_paths(control_center_icondir, 'hicolor', 'symbolic', 'apps') +install_subdir( + 'hicolor', + install_dir: control_center_icondir ) |