summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-04 13:46:46 +0000
committerintrigeri <intrigeri@boum.org>2019-03-04 13:46:46 +0000
commitaddfe85c4b9e120e5cf431922a51414ae44ce83a (patch)
treeeed59df00d7005604db0aa7602b1597d4feae3b9
parent3f1f1b0ecb1c3790fafbf835d3532bb492bff280 (diff)
parent4ecaedbad70ea697b5bad441935a03d45580f500 (diff)
Merge remote-tracking branch 'origin/stable' into test/14596-automated-tests-for-ASP-gui
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-additional-software-config1
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-additional-software-notify6
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/gnome.sh9
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-additional-software17
-rw-r--r--config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui3
m---------submodules/pythonlib0
6 files changed, 27 insertions, 9 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
index ea7bf03..41e0031 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
+++ b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
@@ -153,6 +153,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
# Translators: Don't translate {package}, it's a placeholder and will be replaced.
_("Stop installing {package} "
"automatically").format(package=package_name))
+ remove_button.get_accessible().set_name(_("Remove"))
remove_button.connect(
"clicked", self.cb_listboxrow_remove_button_clicked,
package_name)
diff --git a/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify b/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify
index 2435fe9..90b36b9 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify
+++ b/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify
@@ -6,6 +6,8 @@ import os.path
import subprocess
import sys
+from tailslib.gnome import gnome_env_vars
+
import gi
from gi.repository import GLib
@@ -56,7 +58,9 @@ class ASPNotifier(object):
elif action == "deny":
sys.exit(3)
elif action == "documentation":
- subprocess.Popen(["tails-documentation", user_data])
+ subprocess.Popen(
+ ["env", *gnome_env_vars(), "tails-documentation", user_data]
+ )
sys.exit(5)
def cb_notification_closed(self, notification):
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/gnome.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/gnome.sh
index e996b2a..da390d3 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/gnome.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/gnome.sh
@@ -1,9 +1,16 @@
+GNOME_ENV_VARS="
+DBUS_SESSION_BUS_ADDRESS
+DISPLAY
+XAUTHORITY
+XDG_RUNTIME_DIR
+"
+
export_gnome_env() {
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
local gnome_shell_pid="$(pgrep --newest --euid ${LIVE_USERNAME} gnome-shell)"
local tmp_env_file="$(tempfile)"
- local vars="(DBUS_SESSION_BUS_ADDRESS|DISPLAY|XAUTHORITY)"
+ local vars="($(echo ${GNOME_ENV_VARS} | tr ' ' '|'))"
tr '\0' '\n' < "/proc/${gnome_shell_pid}/environ" | \
grep -E "^${vars}=" > "${tmp_env_file}"
while read line; do export "${line}"; done < "${tmp_env_file}"
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
index 127b7cd..4c3379e 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -107,13 +107,16 @@ def _notify(title, body="", accept_label="", deny_label="",
urgent = ""
try:
- completed_process = subprocess.run(["sudo", "-u", LIVE_USERNAME, cmd,
- title, body, accept_label,
- deny_label, documentation_target,
- urgent],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- universal_newlines=True)
+ completed_process = subprocess.run(
+ [
+ "sudo", "-u", LIVE_USERNAME,
+ cmd, title, body, accept_label, deny_label,
+ documentation_target, urgent
+ ],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ universal_newlines=True
+ )
if completed_process.returncode == 1:
# sudo failed to execute the command
raise OSError(completed_process.stderr)
diff --git a/config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui b/config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui
index 945f3bd..f4e8a21 100644
--- a/config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui
+++ b/config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui
@@ -77,6 +77,9 @@
<property name="label" translatable="yes">The following software is installed automatically from your persistent storage when starting Tails.</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="listbox"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
diff --git a/submodules/pythonlib b/submodules/pythonlib
-Subproject 1629492eaec69483d05658f79c881a7d172cf02
+Subproject 2939c277b1c4df6f77b4a04abf8d718b2f7c2c0