Commit 520cdf73 authored by Neal Norwitz's avatar Neal Norwitz

SF # 539360, webbrowser.py and konqueror, by Andy McKay

Fix Konqueror so it can start when calling open().
The assert needed to be on the raw URL, not openURL 'url...'

Will backport.
parent 98a355d0
...@@ -176,8 +176,7 @@ class Konqueror: ...@@ -176,8 +176,7 @@ class Konqueror:
self.name = self.basename = "kfm" self.name = self.basename = "kfm"
def _remote(self, action): def _remote(self, action):
assert "'" not in action cmd = "kfmclient %s >/dev/null 2>&1" % action
cmd = "kfmclient '%s' >/dev/null 2>&1" % action
rc = os.system(cmd) rc = os.system(cmd)
if rc: if rc:
import time import time
...@@ -192,6 +191,7 @@ class Konqueror: ...@@ -192,6 +191,7 @@ class Konqueror:
def open(self, url, new=1, autoraise=1): def open(self, url, new=1, autoraise=1):
# XXX Currently I know no way to prevent KFM from # XXX Currently I know no way to prevent KFM from
# opening a new win. # opening a new win.
assert "'" not in url
self._remote("openURL '%s'" % url) self._remote("openURL '%s'" % url)
open_new = open open_new = open
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment