From: Christian Dywan <christian@twotoasts.de>
Date: Sun, 14 Aug 2011 23:13:09 +0000 (+0200)
Subject: Thunderbird only accepts feed://, Liferea doesn't mind
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bca83572ab43c759afc74411f4d970343eea522;p=midori

Thunderbird only accepts feed://, Liferea doesn't mind

https://bugs.launchpad.net/midori/+bug/826444
---

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 6b84abd8..f116863c 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2347,12 +2347,22 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* browser,
 {
     if (browser->news_aggregator && *browser->news_aggregator)
     {
+        /* Thunderbird only accepts feed://, Liferea doesn't mind */
+        gchar* feed = g_strdup (uri);
+        if (g_str_has_prefix (feed, "http://"))
+        {
+            feed[0] = 'f';
+            feed[1] = 'e';
+            feed[2] = 'e';
+            feed[3] = 'd';
+        }
         /* Special-case Liferea because a helper script may be required */
         if (g_str_equal (browser->news_aggregator, "liferea")
          && g_find_program_in_path ("liferea-add-feed"))
-            sokoke_spawn_program ("liferea-add-feed", uri);
+            sokoke_spawn_program ("liferea-add-feed", feed);
         else
-            sokoke_spawn_program (browser->news_aggregator, uri);
+            sokoke_spawn_program (browser->news_aggregator, feed);
+        g_free (feed);
     }
     else
     {