diff options
author | Ondrej Holy <oholy@redhat.com> | 2018-02-26 17:41:07 +0100 |
---|---|---|
committer | Ondrej Holy <oholy@redhat.com> | 2018-03-02 08:59:49 +0100 |
commit | 6e4d75eaaffca206e27e80aa5b8a4d3efb84ca3f (patch) | |
tree | 8c6005497e8e86bedb0c30bbd40ff120c9c6e5df | |
parent | ff0ec34161ee94215c34a7d8b8731b40b5720b33 (diff) | |
download | gnome-control-center-6e4d75eaaffca206e27e80aa5b8a4d3efb84ca3f.tar.gz |
user-accounts: Add back legacy image faces
Commit ffe5aac8 introduced new set of face images and removed the old
ones. Consequently, generic avatar is shown for people after update.
Add back legacy images, so people won't lose their current images on
update. Add them into the subfolder and create symlinks for them,
so it can be simply filtered out from the chooser widget, because just
the new images should be shown.
https://gitlab.gnome.org/GNOME/gnome-control-center/issues/5
25 files changed, 43 insertions, 1 deletions
diff --git a/panels/user-accounts/data/faces/legacy/astronaut.jpg b/panels/user-accounts/data/faces/legacy/astronaut.jpg Binary files differnew file mode 100644 index 000000000..4b79f0e2c --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/astronaut.jpg diff --git a/panels/user-accounts/data/faces/legacy/baseball.png b/panels/user-accounts/data/faces/legacy/baseball.png Binary files differnew file mode 100644 index 000000000..0d6dfdb90 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/baseball.png diff --git a/panels/user-accounts/data/faces/legacy/butterfly.png b/panels/user-accounts/data/faces/legacy/butterfly.png Binary files differnew file mode 100644 index 000000000..66b813cca --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/butterfly.png diff --git a/panels/user-accounts/data/faces/legacy/cat-eye.jpg b/panels/user-accounts/data/faces/legacy/cat-eye.jpg Binary files differnew file mode 100644 index 000000000..c818bd5ee --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/cat-eye.jpg diff --git a/panels/user-accounts/data/faces/legacy/chess.jpg b/panels/user-accounts/data/faces/legacy/chess.jpg Binary files differnew file mode 100644 index 000000000..7abb8a4d6 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/chess.jpg diff --git a/panels/user-accounts/data/faces/legacy/coffee.jpg b/panels/user-accounts/data/faces/legacy/coffee.jpg Binary files differnew file mode 100644 index 000000000..46e8fc5c3 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/coffee.jpg diff --git a/panels/user-accounts/data/faces/legacy/dice.jpg b/panels/user-accounts/data/faces/legacy/dice.jpg Binary files differnew file mode 100644 index 000000000..641b124a5 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/dice.jpg diff --git a/panels/user-accounts/data/faces/legacy/energy-arc.jpg b/panels/user-accounts/data/faces/legacy/energy-arc.jpg Binary files differnew file mode 100644 index 000000000..9f4c892ed --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/energy-arc.jpg diff --git a/panels/user-accounts/data/faces/legacy/fish.jpg b/panels/user-accounts/data/faces/legacy/fish.jpg Binary files differnew file mode 100644 index 000000000..fc363d668 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/fish.jpg diff --git a/panels/user-accounts/data/faces/legacy/flake.jpg b/panels/user-accounts/data/faces/legacy/flake.jpg Binary files differnew file mode 100644 index 000000000..5546d7e3e --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/flake.jpg diff --git a/panels/user-accounts/data/faces/legacy/flower.jpg b/panels/user-accounts/data/faces/legacy/flower.jpg Binary files differnew file mode 100644 index 000000000..3e41ba4e6 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/flower.jpg diff --git a/panels/user-accounts/data/faces/legacy/grapes.jpg b/panels/user-accounts/data/faces/legacy/grapes.jpg Binary files differnew file mode 100644 index 000000000..3d31daff8 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/grapes.jpg diff --git a/panels/user-accounts/data/faces/legacy/guitar.jpg b/panels/user-accounts/data/faces/legacy/guitar.jpg Binary files differnew file mode 100644 index 000000000..9e8834f76 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/guitar.jpg diff --git a/panels/user-accounts/data/faces/legacy/launch.jpg b/panels/user-accounts/data/faces/legacy/launch.jpg Binary files differnew file mode 100644 index 000000000..7c7bf4347 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/launch.jpg diff --git a/panels/user-accounts/data/faces/legacy/leaf.jpg b/panels/user-accounts/data/faces/legacy/leaf.jpg Binary files differnew file mode 100644 index 000000000..535410338 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/leaf.jpg diff --git a/panels/user-accounts/data/faces/legacy/lightning.jpg b/panels/user-accounts/data/faces/legacy/lightning.jpg Binary files differnew file mode 100644 index 000000000..736ccd5b0 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/lightning.jpg diff --git a/panels/user-accounts/data/faces/legacy/penguin.jpg b/panels/user-accounts/data/faces/legacy/penguin.jpg Binary files differnew file mode 100644 index 000000000..2a8dfd6a4 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/penguin.jpg diff --git a/panels/user-accounts/data/faces/legacy/puppy.jpg b/panels/user-accounts/data/faces/legacy/puppy.jpg Binary files differnew file mode 100644 index 000000000..ab55a8b8b --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/puppy.jpg diff --git a/panels/user-accounts/data/faces/legacy/sky.jpg b/panels/user-accounts/data/faces/legacy/sky.jpg Binary files differnew file mode 100644 index 000000000..841f90e42 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/sky.jpg diff --git a/panels/user-accounts/data/faces/legacy/soccerball.png b/panels/user-accounts/data/faces/legacy/soccerball.png Binary files differnew file mode 100644 index 000000000..56588a984 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/soccerball.png diff --git a/panels/user-accounts/data/faces/legacy/sunflower.jpg b/panels/user-accounts/data/faces/legacy/sunflower.jpg Binary files differnew file mode 100644 index 000000000..6102b8bae --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/sunflower.jpg diff --git a/panels/user-accounts/data/faces/legacy/sunset.jpg b/panels/user-accounts/data/faces/legacy/sunset.jpg Binary files differnew file mode 100644 index 000000000..48b6223f5 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/sunset.jpg diff --git a/panels/user-accounts/data/faces/legacy/tennis-ball.png b/panels/user-accounts/data/faces/legacy/tennis-ball.png Binary files differnew file mode 100644 index 000000000..a1beb50e1 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/tennis-ball.png diff --git a/panels/user-accounts/data/faces/legacy/yellow-rose.jpg b/panels/user-accounts/data/faces/legacy/yellow-rose.jpg Binary files differnew file mode 100644 index 000000000..7f1de9637 --- /dev/null +++ b/panels/user-accounts/data/faces/legacy/yellow-rose.jpg diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build index b276e2ec8..038e8bc8a 100644 --- a/panels/user-accounts/meson.build +++ b/panels/user-accounts/meson.build @@ -35,11 +35,53 @@ image_data = files( 'data/faces/tree.jpg', ) +legacy_image_data = files( + 'data/faces/legacy/astronaut.jpg', + 'data/faces/legacy/baseball.png', + 'data/faces/legacy/butterfly.png', + 'data/faces/legacy/cat-eye.jpg', + 'data/faces/legacy/chess.jpg', + 'data/faces/legacy/coffee.jpg', + 'data/faces/legacy/dice.jpg', + 'data/faces/legacy/energy-arc.jpg', + 'data/faces/legacy/fish.jpg', + 'data/faces/legacy/flake.jpg', + 'data/faces/legacy/flower.jpg', + 'data/faces/legacy/grapes.jpg', + 'data/faces/legacy/guitar.jpg', + 'data/faces/legacy/launch.jpg', + 'data/faces/legacy/leaf.jpg', + 'data/faces/legacy/lightning.jpg', + 'data/faces/legacy/penguin.jpg', + 'data/faces/legacy/puppy.jpg', + 'data/faces/legacy/sky.jpg', + 'data/faces/legacy/soccerball.png', + 'data/faces/legacy/sunflower.jpg', + 'data/faces/legacy/sunset.jpg', + 'data/faces/legacy/tennis-ball.png', + 'data/faces/legacy/yellow-rose.jpg', +) + +image_dir = join_paths(control_center_datadir, 'pixmaps', 'faces') + install_data( image_data, - install_dir: join_paths(control_center_datadir, 'pixmaps', 'faces') + install_dir: image_dir +) + +legacy_image_dir = join_paths(image_dir, 'legacy') + +install_data( + legacy_image_data, + install_dir: legacy_image_dir ) +# create symlinks for legacy images to not break current images for people +meson.add_install_script('sh', '-c', + 'for f in $DESTDIR@0@/*; do + ln -s legacy/$(basename $f) $DESTDIR@1@/$(basename $f); + done'.format(legacy_image_dir, image_dir)) + polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) i18n.merge_file( |