From: Fred Drake <fdrake@acm.org>
Date: Mon, 26 Mar 2001 15:06:15 +0000 (+0000)
Subject: Update auto-detection for Konqueror to include KDE 2 -- the kfm command is
X-Git-Tag: v2.1c1~236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc31f2692f3cf022606b48534801f4371bf11001;p=thirdparty%2FPython%2Fcpython.git

Update auto-detection for Konqueror to include KDE 2 -- the kfm command is
gone; "konqueror" is the new name, and the command-line args are different.
kfmclient has not changed, though.
---

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 77edf0df77ce..ebafd80ba006 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -136,7 +136,7 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
             register("mosaic", None, GenericBrowser("mosaic %s >/dev/null &"))
 
         # Konqueror/kfm, the KDE browser.
-        if _iscommand("kfm"):
+        if _iscommand("kfm") or _iscommand("konqueror"):
             class Konqueror:
                 """Controller for the KDE File Manager (kfm, or Konqueror).
 
@@ -149,7 +149,10 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
                     rc = os.system(cmd)
                     if rc:
                         import time
-                        os.system("kfm -d &")
+                        if _iscommand("konqueror"):
+                            os.system("konqueror --silent &")
+                        else:
+                            os.system("kfm -d &")
                         time.sleep(PROCESS_CREATION_DELAY)
                         rc = os.system(cmd)
                     return not rc