From afdd57457dbc24c7c348ff631ca7d8dfd18480f4 Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Thu, 16 Aug 2018 01:08:23 -0500 Subject: [PATCH] Use x-terminal-emulator in lieu of xterm for connection editing. (LP: #1786978) Summary: Removes hard requirement for xterm, which caused connection editing to fail. Test Plan: 1. Right click on nm-tray 2. Click "Edit Connections" If successful, qterminal will open, though the display will not be correct. Additional changes to lubuntu-default-settings are required, as described in the bug. Reviewers: tsimonq2 Reviewed By: tsimonq2 Differential Revision: https://phab.lubuntu.me/D3 --- debian/changelog | 5 +++++ debian/patches/generalize-terminal-for-edits.patch | 10 ++++++++++ debian/patches/series | 1 + 3 files changed, 16 insertions(+) create mode 100644 debian/patches/generalize-terminal-for-edits.patch diff --git a/debian/changelog b/debian/changelog index 74c06a1..4aab81d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ nm-tray (0.4.0-0ubuntu2) UNRELEASED; urgency=medium + [ Simon Quigley ] * Update Vcs-* for the new location. + [ Walter Lapchynski ] + * generalize-terminal-for-edits.patch: Use x-terminal-emulator in lieu of + xterm for connection editing. (LP: #1786978) + -- Simon Quigley Thu, 05 Jul 2018 17:48:30 -0500 nm-tray (0.4.0-0ubuntu1) cosmic; urgency=medium diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch new file mode 100644 index 0000000..692b839 --- /dev/null +++ b/debian/patches/generalize-terminal-for-edits.patch @@ -0,0 +1,10 @@ +Description: Use x-terminal emulator in lieu of xterm for connection edits. +Author: Walter Lapchynski +Bug: https://launchpad.net/bugs/1786978 +--- a/resources/nm-tray.conf ++++ b/resources/nm-tray.conf +@@ -1,3 +1,3 @@ + [General] +-connectionsEditor=xterm, -e, nmtui-edit ++connectionsEditor=x-terminal-emulator, -e, nmtui-edit + enableNotifications=true diff --git a/debian/patches/series b/debian/patches/series index 0823679..a00b3b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-internal-version.patch +generalize-terminal-for-edits.patch