From 723528e407bca6f2aa26461e6f8bcc7de32b056d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 20 Jun 2010 22:02:02 -0400 Subject: =?UTF-8?q?Revert=20"Bug=20581032=20=E2=80=93=20Some=20links=20can?= =?UTF-8?q?'t=20be=20opened"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8b32dcadba4c705af60b1e33b24f46d97f7181d6. Breaks opening more common URL-encoded links (see bug #621721). Will take a closer look at the test case in bug #581032. --- e-util/e-util.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'e-util/e-util.c') diff --git a/e-util/e-util.c b/e-util/e-util.c index 3728489fa4..956f7d009f 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -147,7 +147,6 @@ e_show_uri (GtkWindow *parent, GtkWidget *dialog; GdkScreen *screen = NULL; GError *error = NULL; - gchar *decoded_uri; guint32 timestamp; g_return_if_fail (uri != NULL); @@ -157,11 +156,8 @@ e_show_uri (GtkWindow *parent, if (parent != NULL) screen = gtk_widget_get_screen (GTK_WIDGET (parent)); - decoded_uri = g_strdup (uri); - camel_url_decode (decoded_uri); - - if (gtk_show_uri (screen, decoded_uri, timestamp, &error)) - goto exit; + if (gtk_show_uri (screen, uri, timestamp, &error)) + return; dialog = gtk_message_dialog_new_with_markup ( parent, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -176,9 +172,6 @@ e_show_uri (GtkWindow *parent, gtk_widget_destroy (dialog); g_error_free (error); - -exit: - g_free (decoded_uri); } /** -- cgit v1.2.3