Midori Web Browser

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

  1. twitter-rss
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: André Stösel
Approved revision: 6274
Merged at revision: 6275
Proposed branch: lp:~tuxator/midori/twitter-rss
Merge into: lp:midori
Diff against target: 16 lines (+1/-6)
1 file modified
midori/midori-view.c (+1/-6)
To merge this branch: bzr merge lp:~tuxator/midori/twitter-rss
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+175345@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-view.c'
2--- midori/midori-view.c 2013-07-15 17:07:45 +0000
3+++ midori/midori-view.c 2013-07-17 17:38:28 +0000
4@@ -1305,12 +1305,7 @@
5 "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) "
6 "f.push ('$' + l[i].href + '|' + l[i].title);"
7 "else if (r == 'search' && t == 'application/opensearchdescription+xml') "
8- "f.push (':' + l[i].href + '|' + l[i].title); "
9- "} if (document.location.href.indexOf ('twitter') != -1)"
10- "{ var s = document.location.href.split('/'); "
11- "var u = 'https://api.twitter.com/1/statuses/user_timeline.rss"
12- "?include_rts=true&screen_name=' + s[3] + '&count=25'; "
13- "f.push ('$' + u + '|' + 'Twitter / ' + s[3]); } "
14+ "f.push (':' + l[i].href + '|' + l[i].title); } "
15 "return f; })("
16 "document.getElementsByTagName ('link'));", NULL);
17

Subscribers

People subscribed via source and target branches

to all changes: