summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-03-05 14:59:47 +0000
committerintrigeri <intrigeri@boum.org>2017-03-05 14:59:47 +0000
commit034e973a8cfde72063f736024282ea61328ead74 (patch)
treed00244f6c5e2bff810e1d77b3e54876898bf5cc9
parent98c6b6757fddd949920f28a4853e5389fb0c6f05 (diff)
Make notification action ids unique, in case it helps with the weird behaviour we see when multiple notifications with actions are displayed at the same time. (refs: #12193)
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user3
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user3
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-virt-notify-user3
3 files changed, 6 insertions, 3 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user b/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
index 65359ac..20aaf19 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
+++ b/config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
@@ -23,6 +23,7 @@ See https://tails.boum.org/.
#}}}
use Desktop::Notify;
+use English '-no_match_vars';
use Locale::gettext;
use Net::DBus::Reactor;
use Path::Tiny;
@@ -59,7 +60,7 @@ my $summary = gettext("Warning: Tails 3.0 won't work on this computer!");
my $body = gettext("Tails 3.0 will require a 64-bit processor.");
$notify->create(summary => $summary,
body => $body,
- actions => { 'moreinfo' => gettext('Learn more'), },
+ actions => { "moreinfo_$PID" => gettext('Learn more'), },
hints => { 'transient' => 1, },
timeout => 0)->show();
diff --git a/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user b/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
index 7a03f69..25408c4 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
+++ b/config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
@@ -23,6 +23,7 @@ See https://tails.boum.org/.
#}}}
use Desktop::Notify;
+use English '-no_match_vars';
use Locale::gettext;
use Net::DBus::Reactor;
use POSIX;
@@ -55,7 +56,7 @@ $notify->close_callback(sub { $reactor->shutdown; });
my $summary = gettext("Warning: I2P will be removed in Tails 2.12");
$notify->create(summary => $summary,
- actions => { 'moreinfo' => gettext('Learn more'), },
+ actions => { "moreinfo_$PID" => gettext('Learn more'), },
hints => { 'transient' => 1, },
timeout => 0)->show();
diff --git a/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user b/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user
index 49abe4e..41ecc41 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/lib/tails-virt-notify-user
@@ -23,6 +23,7 @@ See https://tails.boum.org/.
#}}}
use Desktop::Notify;
+use English '-no_match_vars';
use IPC::System::Simple qw{capturex $EXITVAL};
use Locale::gettext;
use Net::DBus::Reactor;
@@ -79,7 +80,7 @@ else {
$notify->create(summary => $summary,
body => $body,
- actions => { 'moreinfo' => gettext('Learn more'), },
+ actions => { "moreinfo_$PID" => gettext('Learn more'), },
hints => { 'transient' => 1, },
timeout => 0)->show();