Merge lp:~yofel/apport/lp-765808 into lp:~apport-hackers/apport/trunk

[Philip Muškovac]

kfmclient is part of konqueror which isn't shipped in kubuntu by default anymore since we use rekonq now. Apport should use kde-open to open URLs instead which is part of kdebase-runtime and shipped by default.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'apport/ui.py'
--- apport/ui.py	2011-03-31 15:23:04 +0000
+++ apport/ui.py	2011-04-20 14:33:28 +0000
@@ -877,12 +877,12 @@
 
         # figure out appropriate web browser
         try:
-            # if ksmserver is running, try kfmclient
+            # if ksmserver is running, try kde-open
             try:
                 if os.getenv('DISPLAY') and \
                         subprocess.call(['pgrep', '-x', '-u', str(uid), 'ksmserver'],
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0:
-                    subprocess.call(sudo_prefix + ['kfmclient', 'openURL', url])
+                    subprocess.call(sudo_prefix + ['kde-open', url])
                     sys.exit(0)
             except OSError:
                 pass