Midori Web Browser

Merge lp:~axlrose112/midori/webmedia-now-playing_update into lp:midori

  1. webmedia-now-playing_update
  2. Merge into trunk
Proposed by axlrose112
Status: Merged
Approved by: Cris Dywan
Approved revision: 6901
Merged at revision: 6902
Proposed branch: lp:~axlrose112/midori/webmedia-now-playing_update
Merge into: lp:midori
Diff against target: 31 lines (+4/-4)
1 file modified
extensions/webmedia-now-playing.vala (+4/-4)
To merge this branch: bzr merge lp:~axlrose112/midori/webmedia-now-playing_update
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+253766@code.launchpad.net

Commit message

Update coub support in mediaHerald

Description of the change

Update Coub

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/webmedia-now-playing.vala'
2--- extensions/webmedia-now-playing.vala 2015-02-19 19:24:41 +0000
3+++ extensions/webmedia-now-playing.vala 2015-03-21 22:39:24 +0000
4@@ -18,7 +18,7 @@
5 string web_media_title { get; set; }
6 internal Manager () {
7 GLib.Object (name: _("Webmedia now-playing"),
8- description: _("Share 'youtube, vimeo, dailymotion' that you are playing in Midori using org.midori.mediaHerald"),
9+ description: _("Share 'youtube, vimeo, dailymotion, coub and zippcast' that you are playing in Midori using org.midori.mediaHerald"),
10 version: "0.1" + Midori.VERSION_SUFFIX,
11 authors: "James Axl <axlrose112@gmail.com>");
12 activate.connect (this.activated);
13@@ -36,7 +36,7 @@
14 var youtube = new Regex("""(http|https)://www.youtube.com/watch\?v=[&=_\-A-Za-z0-9.\|]+""");
15 var vimeo = new Regex("""(http|https)://vimeo.com/[0-9]+""");
16 var dailymotion = new Regex("""(http|https)://www.dailymotion.com/video/[_\-A-Za-z0-9]+""");
17- var coud = new Regex("""(http|https)://coub.com/view/[&=_\-A-Za-z0-9.\|]+""");
18+ var coub = new Regex("""(http|https)://coub.com/view/[&=_\-A-Za-z0-9.\|]+""");
19 var zippcast = new Regex("""(http|https)://www.zippcast.com/video/[&=_\-A-Za-z0-9.\|]+""");
20
21 string website = null;
22@@ -49,8 +49,8 @@
23 website = "Vimeo";
24 else if (dailymotion.match(web_media_uri))
25 website = "Dailymotion";
26- else if (coud.match(web_media_uri))
27- website = "Coud";
28+ else if (coub.match(web_media_uri))
29+ website = "Coub";
30 else if (zippcast.match(web_media_uri))
31 website = "ZippCast";
32

Subscribers

People subscribed via source and target branches

to all changes: