Patchwork make menuconfig work for recent xfce environment

login
register
mail settings
Submitter Andreas Müller
Date April 17, 2014, 8:13 a.m.
Message ID <1397722406-14830-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/70625/
State New
Headers show

Comments

Andreas Müller - April 17, 2014, 8:13 a.m.
xfce terminal was renamed 'Terminal' -> 'xfce4-teminal' mainline end of 2012,
so the distros supporting 'Terminal' will dissapear. The distros not
mentionied in  __init__ do (e.g fedora 19 - tested) fail - or will fail
sooner or later.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/lib/oe/terminal.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Patch

diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index a33abd7..0a623c7 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -60,19 +60,9 @@  class Mate(XTerminal):
     priority = 2
 
 class Xfce(XTerminal):
-    command = 'Terminal -T "{title}" -e "{command}"'
+    command = 'xfce4-terminal -T "{title}" -e "{command}"'
     priority = 2
 
-    def __init__(self, command, title=None, env=None, d=None):
-        # Upstream binary name is Terminal but Debian/Ubuntu use
-        # xfce4-terminal to avoid possible(?) conflicts
-        distro = distro_name()
-        if distro == 'ubuntu' or distro == 'debian':
-            cmd = 'xfce4-terminal -T "{title}" -e "{command}"'
-        else:
-            cmd = command
-        XTerminal.__init__(self, cmd, title, env, d)
-
 class Konsole(XTerminal):
     command = 'konsole -T "{title}" -e {command}'
     priority = 2