Merge lp:~midori/midori/thoughThaltNotCancelYourIcons into lp:midori

[Cris Dywan]

We must not pass a Cancellable to FaviconDatabase.get_favicon_pixbuf

[Paweł Forysiuk (tuxator)]

Seems to fix the crasher here.

review: Approve

=== modified file 'katze/midori-uri.vala'
--- katze/midori-uri.vala	2014-03-03 01:17:05 +0000
+++ katze/midori-uri.vala	2014-04-02 23:59:21 +0000
@@ -236,7 +236,8 @@
             var pixbuf = Gdk.pixbuf_get_from_surface (image, 0, 0, image.get_width (), image.get_height ());
 #else
             var database = WebKit.get_favicon_database ();
-            var pixbuf = yield database.get_favicon_pixbuf (uri, 0, 0, cancellable);
+            // We must not pass a Cancellable due to a crasher bug
+            var pixbuf = yield database.get_favicon_pixbuf (uri, 0, 0, null);
 #endif
             return pixbuf as GLib.Icon;
         }

=== modified file 'midori/webkitgtk-3.0.vapi'
--- midori/webkitgtk-3.0.vapi	2014-03-03 01:17:05 +0000
+++ midori/webkitgtk-3.0.vapi	2014-04-02 23:59:21 +0000
@@ -6,7 +6,7 @@
 	public class FaviconDatabase : GLib.Object {
 		public signal void icon_loaded (string frame_uri);
 		public Gdk.Pixbuf? try_get_favicon_pixbuf (string page_uri, uint width, uint height);
-		public async Gdk.Pixbuf? get_favicon_pixbuf (string page_uri, uint width, uint height, GLib.Cancellable cancellable) throws GLib.Error;
+		public async Gdk.Pixbuf? get_favicon_pixbuf (string page_uri, uint width, uint height, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void set_path (string? path);
 		public void clear ();
 	}