conduit r1800 - in branches/gnome-2-24: . conduit/gtkui

[jstowers svn gnome org]

Author: jstowers
Date: Sat Nov 15 10:14:21 2008
New Revision: 1800
URL: http://svn.gnome.org/viewvc/conduit?rev=1800&view=rev

Log:
2008-11-15  John Stowers  <john stowers gmail com>

	* conduit/gtkui/UI.py: Use gtk_show_uri to show the help
    Fixes #559055



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/conduit/gtkui/UI.py

Modified: branches/gnome-2-24/conduit/gtkui/UI.py
==============================================================================
--- branches/gnome-2-24/conduit/gtkui/UI.py	(original)
+++ branches/gnome-2-24/conduit/gtkui/UI.py	Sat Nov 15 10:14:21 2008
@@ -430,11 +430,19 @@
         else:
             #if we are not installed then launch the ghelp uri with a full path
             uri = "ghelp:%s" % os.path.join(conduit.DIRECTORY,"help","C","conduit.xml")
+
         log.debug("Launching help: %s" % uri)
-        gobject.spawn_async(
-                    argv=("xdg-open",uri),
-                    flags=gobject.SPAWN_SEARCH_PATH | gobject.SPAWN_STDOUT_TO_DEV_NULL | gobject.SPAWN_STDERR_TO_DEV_NULL
-                    )
+
+        if gtk.gtk_version >= (2,14,0):
+            gtk.show_uri(
+                self.mainWindow.get_screen(),
+                uri,
+                gtk.get_current_event_time())
+        else:
+            gobject.spawn_async(
+                        argv=("xdg-open",uri),
+                        flags=gobject.SPAWN_SEARCH_PATH | gobject.SPAWN_STDOUT_TO_DEV_NULL | gobject.SPAWN_STDERR_TO_DEV_NULL
+                        )
 
     def on_window_state_event(self, widget, event):
         visible = self.is_visible()