Commit 2e43aa7c authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'bugfix/7326-systray-icons' into feature/6342-update-camouflage-for-gnome3

Conflicts:
	config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme
parents de66abfd 0b208ff9
......@@ -117,6 +117,12 @@ dconf write /org/gnome/gnome-panel/layout/objects/clock/pack-type '"end"'
# it.
dconf write /org/gnome/gnome-panel/layout/toplevels/bottom-panel/size '48'
# XXX Ugly restart hacks because this script runs too late
# Restart the panel
# XXX this is ugly
pkill gnome-panel
# Restart florence to make it use the right icon
pkill florence && florence &/usr/share/pixmaps/gpgApplet/48x48-grey/gpgApplet
# Mute and unmute volume to fix its icon
amixer set Master toggle
sleep 0.1
amixer set Master toggle
......@@ -28,4 +28,6 @@ ln -s "/usr/share/icons/Windows8/devices/input-keyboard-symbolic.png" \
# Set gpgApplet tray icon
rm "/usr/share/pixmaps/gpgApplet/scalable" -r
mv "/usr/share/pixmaps/gpgApplet/scalable-grey" "/usr/share/pixmaps/gpgApplet/scalable"
ln -s "/usr/share/pixmaps/gpgApplet/scalable-grey" "/usr/share/pixmaps/gpgApplet/scalable"
rm "/usr/share/pixmaps/gpgApplet/48x48/" -r
ls -s "/usr/share/pixmaps/gpgApplet/48x48-grey" "/usr/share/pixmaps/gpgApplet/48x48"
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment