[epiphany/tmp-gnome-2-32: 16/31] Fixed detected feed URL for relative URIs



commit d8ffb74484395b1559971b36ab00df4768961701
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Apr 23 12:13:53 2010 +0200

    Fixed detected feed URL for relative URIs
    
    Bug #609817

 embed/ephy-web-view.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index b240d19..02fb155 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1247,8 +1247,21 @@ do_hook_into_links (JSContextRef js_context, EphyWebView *web_view)
       char *type = js_get_element_attribute (js_context, obj, "type");
       char *title = js_get_element_attribute (js_context, obj, "title");
       char *address = js_get_element_attribute (js_context, obj, "href");
+      SoupURI *feed_uri, *current_uri;
 
-      g_signal_emit_by_name (web_view, "ge-feed-link", type, title, address);
+      feed_uri = soup_uri_new (address);
+      if (!feed_uri) {
+        current_uri = soup_uri_new (ephy_web_view_get_address (web_view));
+        feed_uri = soup_uri_new_with_base (current_uri, address);
+        soup_uri_free (current_uri);
+      }
+
+      if (feed_uri) {
+        g_free (address);
+        address = soup_uri_to_string (feed_uri, FALSE);
+        g_signal_emit_by_name (web_view, "ge-feed-link", type, title, address);
+        soup_uri_free (feed_uri);
+      }
 
       g_free (type);
       g_free (title);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]