Merge lp:~tuxator/midori/twitter-rss into lp:midori

[Paweł Forysiuk]

Don't show rss feed icon on twitter, underlying API was retired

[André Stösel (ivaldi)]

Looks good!

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-07-15 17:07:45 +0000
+++ midori/midori-view.c	2013-07-17 17:38:28 +0000
@@ -1305,12 +1305,7 @@
         "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) "
         "f.push ('$' + l[i].href + '|' + l[i].title);"
         "else if (r == 'search' && t == 'application/opensearchdescription+xml') "
-        "f.push (':' + l[i].href + '|' + l[i].title); "
-        "} if (document.location.href.indexOf ('twitter') != -1)"
-        "{ var s = document.location.href.split('/'); "
-        "var u = 'https://api.twitter.com/1/statuses/user_timeline.rss"
-        "?include_rts=true&screen_name=' + s[3] + '&count=25'; "
-        "f.push ('$' + u + '|' + 'Twitter / ' + s[3]); } "
+        "f.push (':' + l[i].href + '|' + l[i].title); } "
         "return f; })("
         "document.getElementsByTagName ('link'));", NULL);