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

Proposed by Philip Muškovac
Status: Merged
Merged at revision: 1893
Proposed branch: lp:~yofel/apport/lp-765808
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 18 lines (+2/-2)
1 file modified
apport/ui.py (+2/-2)
To merge this branch: bzr merge lp:~yofel/apport/lp-765808
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+58501@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apport/ui.py'
2--- apport/ui.py 2011-03-31 15:23:04 +0000
3+++ apport/ui.py 2011-04-20 14:33:28 +0000
4@@ -877,12 +877,12 @@
5
6 # figure out appropriate web browser
7 try:
8- # if ksmserver is running, try kfmclient
9+ # if ksmserver is running, try kde-open
10 try:
11 if os.getenv('DISPLAY') and \
12 subprocess.call(['pgrep', '-x', '-u', str(uid), 'ksmserver'],
13 stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0:
14- subprocess.call(sudo_prefix + ['kfmclient', 'openURL', url])
15+ subprocess.call(sudo_prefix + ['kde-open', url])
16 sys.exit(0)
17 except OSError:
18 pass

Subscribers

People subscribed via source and target branches