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

[axlrose112]

Disable Notify when extension is deactivated

Disable Notify when extension is deactivated

[Cris Dywan (kalikiana)]

8 + Midori.Browser page { get; set; }

This isn't a good use of a global property. You should avoid storing "the" browser whenever you can as there can be many of them.

Rather use the "object" in youtube_validation which is in fact the browser you want.

review: Needs Fixing

[lp:~axlrose112/midori/webmedia-now-playing]

6765. By Launchpad Translations on behalf of midori on 2014-07-31

Launchpad automatic translations update.

[axlrose112 (axlrose112)]

i fixed it

[lp:~axlrose112/midori/webmedia-now-playing]

6766. By Launchpad Translations on behalf of midori on 2014-08-01

Launchpad automatic translations update.

6767. By gue5t <email address hidden> on 2014-08-01

Fix crash when saving with associated resources

6768. By Launchpad Translations on behalf of midori on 2014-08-02

Launchpad automatic translations update.

6769. By Launchpad Translations on behalf of midori on 2014-08-03

Launchpad automatic translations update.

6770. By Launchpad Translations on behalf of midori on 2014-08-05

Launchpad automatic translations update.

6771. By Launchpad Translations on behalf of midori on 2014-08-07

Launchpad automatic translations update.

6772. By Launchpad Translations on behalf of midori on 2014-08-08

Launchpad automatic translations update.

[Cris Dywan (kalikiana)]

Nice, thanks!

review: Approve

[lp:~axlrose112/midori/webmedia-now-playing]

6773. By axlrose112 on 2014-08-10

Disable Notify when extension is deactivated

=== modified file 'extensions/webmedia-now-playing.vala'
--- extensions/webmedia-now-playing.vala	2014-06-01 18:59:01 +0000
+++ extensions/webmedia-now-playing.vala	2014-07-31 13:25:28 +0000
@@ -25,18 +25,19 @@
             deactivate.connect (this.deactivated);
         }
 
-        void youtube_validation (string title, string uri) {
-            if(uri == title || uri.contains(title)) return;
-            if (web_media_uri == uri) return;
-            if (web_media_title == title) return;
-            web_media_uri = uri;
-            web_media_title = title;
+        void youtube_validation (Object object,  ParamSpec pspec) {
+            var browser = object as Midori.Browser;
+            if(browser.uri == browser.title || browser.uri.contains(browser.title)) return;
+            if (web_media_uri == browser.uri) return;
+            if (web_media_title == browser.title) return;
+            web_media_uri = browser.uri;
+            web_media_title = browser.title;
             try { 
                     var youtube = new Regex("""(http|https)://www.youtube.com/watch\?v=[&=_\-A-Za-z0-9.]+""");
                     var vimeo = new Regex("""(http|https)://vimeo.com/[0-9]+""");
                     var dailymotion = new Regex("""(http|https)://www.dailymotion.com/video/[_\-A-Za-z0-9]+""");
                     string website = null;
-                    if (web_media_uri.contains("youtube") || uri.contains("vimeo") || uri.contains ("dailymotion")) {
+                    if (web_media_uri.contains("youtube") || web_media_uri.contains("vimeo") || web_media_uri.contains ("dailymotion")) {
                         if (youtube.match(web_media_uri))
                             website = "Youtube";
                         else if (vimeo.match(web_media_uri))
@@ -58,9 +59,7 @@
         }
 
         void browser_added (Midori.Browser browser) {
-            browser.notify["title"].connect (() => {
-                youtube_validation(browser.title, browser.uri);
-            });
+            browser.notify["title"].connect (youtube_validation);
         }
 
         void activated (Midori.App app) {
@@ -76,6 +75,8 @@
             var app = get_app ();
             app.add_browser.disconnect (browser_added);
             dbus_service.unregister_service();
+            foreach (var browser in app.get_browsers ())
+                browser.notify["title"].disconnect (youtube_validation);
         }
     }