Updating branch refs/heads/master
         to 93e846bf47e0664fd207036b9950b0c7e92129a5 (commit)
       from a51b8f18dcac2ebcbf5ee7742b4551d3b54dbd7e (commit)

commit 93e846bf47e0664fd207036b9950b0c7e92129a5
Author: Christian Dywan <christ...@twotoasts.de>
Date:   Sat Oct 3 02:16:15 2009 +0200

    Display IDN hostnames decoded in address completion

 midori/midori-locationaction.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index ffda445..f19f0d9 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -619,6 +619,7 @@ midori_location_entry_render_text_cb (GtkCellLayout*   
layout,
                                       GtkTreeIter*     iter,
                                       gpointer         data)
 {
+    gchar* uri_raw;
     gchar* uri;
     gchar* title;
     gchar* desc;
@@ -632,7 +633,14 @@ midori_location_entry_render_text_cb (GtkCellLayout*   
layout,
     gchar** parts;
     size_t len;
 
-    gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1);
+    gtk_tree_model_get (model, iter, URI_COL, &uri_raw, TITLE_COL, &title, -1);
+
+    #if GLIB_CHECK_VERSION (2, 22, 0)
+    uri = g_hostname_to_unicode (uri_raw);
+    g_free (uri_raw);
+    #else
+    uri = uri_raw;
+    #endif
 
     desc = desc_uri = desc_title = key = NULL;
     if (G_LIKELY (data))
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to