Merge lp:~turl/specto/better-web-launching into lp:specto

[Emilio]

[lp:~turl/specto/better-web-launching]

147. By Emilio on 2010-01-06

Cosmetic fix.

148. By Emilio on 2010-01-06

Remove GConf fallback from return_webpage.

[Jeff Fortin Tam (kiddo)]

Two things:
- The Pythonic/PEP-8 way is to write "if path:", not "if path is not False:"
- It doesn't work here. My gnome settings for preferred applications were set by chromium to be:

/usr/lib/chromium-browser/chromium-browser %s

review: Needs Fixing

Unmerged revisions

148. By Emilio on 2010-01-06

Remove GConf fallback from return_webpage.

147. By Emilio on 2010-01-06

Cosmetic fix.

146. By Emilio on 2009-12-29

Improve return_webpage to use xdg-open when available.

=== modified file 'spectlib/util.py'
--- spectlib/util.py	2009-12-29 21:45:20 +0000
+++ spectlib/util.py	2010-01-06 19:50:23 +0000
@@ -28,13 +28,19 @@
 
 def return_webpage(webpage):
     """ Open the webpage in the default browser. """
-    specto_gconf = Specto_gconf("/desktop/gnome/url-handlers/http")
-    default_browser = specto_gconf.get_entry("command")
-    # Return the browser executable with the URL
-    if "%s" in default_browser:  # Most browsers
-        return (default_browser % webpage)
-    else:  # TODO: This is a hack for Google Chrome. We should use xdg-open instead, ideally. See bug #284.
-        return ("%s %s" % (default_browser, webpage))
+    # Scan the system path looking for a supported launcher
+    path = os.environ.get('PATH',False)
+    if path is not False:
+        path = path.split(':')
+        possible_launchers = ('xdg-open','gnome-open','kde-open','x-www-browser')
+        for launcher in possible_launchers:
+            for directory in path:
+                test_file = os.path.join(directory,launcher)
+                if os.path.isfile(test_file):
+                    return ("%s %s" % (test_file, webpage))
+    
+    # There is no way for us to know the user's preferred browser :(
+    return False
 
 
 def show_webpage(webpage):