aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-02 12:56:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-02 12:56:55 +0800
commitf5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea (patch)
tree91036c36e2a40ee98dda5788ac5df66d536ee8af /e-util
parent15af330cacae649e86d4d89a7a8c7f1795baa7ca (diff)
downloadgsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar
gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.gz
gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.bz2
gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.lz
gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.xz
gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.zst
gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.zip
Merge changes from master.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-util.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 071f5e58b8..576f46e54b 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -40,6 +40,8 @@
#include <glib/gstdio.h>
#include <libgnome/gnome-init.h>
+#include <camel/camel-url.h>
+
#ifdef G_OS_WIN32
#include <windows.h>
#endif
@@ -108,6 +110,7 @@ e_show_uri (GtkWindow *parent,
GtkWidget *dialog;
GdkScreen *screen = NULL;
GError *error = NULL;
+ gchar *decoded_uri;
guint32 timestamp;
g_return_if_fail (uri != NULL);
@@ -117,8 +120,11 @@ e_show_uri (GtkWindow *parent,
if (parent != NULL)
screen = gtk_widget_get_screen (GTK_WIDGET (parent));
- if (gtk_show_uri (screen, uri, timestamp, &error))
- return;
+ decoded_uri = g_strdup (uri);
+ camel_url_decode (decoded_uri);
+
+ if (gtk_show_uri (screen, decoded_uri, timestamp, &error))
+ goto exit;
dialog = gtk_message_dialog_new_with_markup (
parent, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -133,6 +139,9 @@ e_show_uri (GtkWindow *parent,
gtk_widget_destroy (dialog);
g_error_free (error);
+
+exit:
+ g_free (decoded_uri);
}
/**