[yelp] 2009-04-27 Don Scorgie <dscorgie svn gnome org>

[Don Scorgie <dscorgie src gnome org>]

commit 96dd47d7281dcefc87319c676a6f410e62f367e7
Author: Don Scorgie <dscorgie git gnome org>
Date:   Tue Apr 28 19:15:21 2009 +0100

    2009-04-27  Don Scorgie  <dscorgie svn gnome org>
    
            * src/yelp-window.c:
            Replacing syncronous spawn functions by a simple
            gtk_show_uri (fixes bug #561404 - patch from
            Lincon de Sousa)
---
 ChangeLog         |    7 +++++++
 src/yelp-window.c |   19 +++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a126cac..7965019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-27  Don Scorgie  <dscorgie svn gnome org>
+
+	* src/yelp-window.c: 
+	Replacing syncronous spawn functions by a simple 
+	gtk_show_uri (fixes bug #561404 - patch from
+	Lincon de Sousa)
+
 2009-04-08  Shaun McCance  <shaunm gnome org>
 
 	* src/yelp-transform.c:
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 8f5c405..deb36fd 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -1051,10 +1051,6 @@ yelp_window_load (YelpWindow *window, const gchar *uri)
 	    break;
 	case YELP_RRN_TYPE_EXTERNAL:
 	    {
-		gchar *str_stdout = NULL;
-		gchar *str_stderr = NULL;
-		gchar *cmd = NULL;
-		gint status = 0;
 		GError *error = NULL;
 
 		priv->base_uri = old_base_uri;
@@ -1069,20 +1065,11 @@ yelp_window_load (YelpWindow *window, const gchar *uri)
 		    return;
 		}
 
-		cmd = g_strdup_printf ("gnome-open %s", uri);
-		if (!g_spawn_command_line_sync (cmd, &str_stdout, &str_stderr, &status, &error)) {
-		    g_free (error);
-		    error = NULL;
-		    g_free (cmd);
-		    cmd = g_strdup_printf ("xdg-open %s", uri);
-		    if (!g_spawn_command_line_sync (cmd, &str_stdout, &str_stderr, &status, &error)) {
-			window_error(window, _("Error executing \"gnome-open\""), error->message, FALSE);
-			return;
-		    }
-		}
-		if (status) {
+		if (!gtk_show_uri (NULL, trace_uri, gtk_get_current_event_time (), &error)) {
 		    gchar *message = g_strdup_printf (_("The requested URI \"%s\" is invalid"), trace_uri);
 		    window_error (window, _("Unable to load page"), message, FALSE);
+		    g_free (error);
+		    error = NULL;
 		    return;
 		}
 	    }