[Xfce4-commits] <midori:master> Thunderbird only accepts feed://, Liferea doesn't mind

[Christian Dywan]

Updating branch refs/heads/master
         to 8bca83572ab43c759afc74411f4d970343eea522 (commit)
       from c5151ff09ad0a88b8e9ed563a170e535082299dc (commit)

commit 8bca83572ab43c759afc74411f4d970343eea522
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Aug 15 01:13:09 2011 +0200

    Thunderbird only accepts feed://, Liferea doesn't mind
    
    https://bugs.launchpad.net/midori/+bug/826444

 midori/midori-browser.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 6b84abd..f116863 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
     {