From dbac91e980625727bca05b9b9b36e0dc06747c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20P=2E=20M=C3=B6ller?= Date: Tue, 30 Jul 2019 19:12:08 -0700 Subject: [PATCH] Reverted previous commit Summary: Reverted previous commit that changed connection editor Test Plan: edit connection should open nm-tui Reviewers: wxl, tsimonq2 Reviewed By: wxl Subscribers: wxl Differential Revision: https://phab.lubuntu.me/D25 --- debian/changelog | 6 ++++++ debian/patches/generalize-terminal-for-edits.patch | 10 ++++++++++ debian/patches/nm-connection-editor.patch | 10 ---------- debian/patches/series | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 debian/patches/generalize-terminal-for-edits.patch delete mode 100644 debian/patches/nm-connection-editor.patch diff --git a/debian/changelog b/debian/changelog index caa2126..1c71cbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nm-tray (0.4.1-0ubuntu3) UNRELEASED; urgency=medium + + * Reverted previous commit 1bc4f5406954 + + -- Hans P Möller Tue, 30 Jul 2019 21:19:07 -0400 + nm-tray (0.4.1-0ubuntu2) eoan; urgency=medium * Changed connection editor to nm-connnection-editor diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch new file mode 100644 index 0000000..acbb64d --- /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/nm-connection-editor.patch b/debian/patches/nm-connection-editor.patch deleted file mode 100644 index 78d0ca9..0000000 --- a/debian/patches/nm-connection-editor.patch +++ /dev/null @@ -1,10 +0,0 @@ -Description: Use nm-connection-editor from network-manager-gnome for connection edits. -Author: Hans P. Möller -Bug-Ubuntu: https://launchpad.net/bugs/1810095 ---- a/resources/nm-tray.conf -+++ b/resources/nm-tray.conf -@@ -1,3 +1,3 @@ - [General] --connectionsEditor=xterm, -e, nmtui-edit -+connectionsEditor=nm-connection-editor - enableNotifications=true diff --git a/debian/patches/series b/debian/patches/series index bce1a1c..7cdc5d4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -nm-connection-editor.patch +generalize-terminal-for-edits.patch blacklist-from-menu.patch