Merge lp:~gue5t/midori/hidpiTabs into lp:~midori/midori/hidpiTabs

[gue5t gue5t]

Scale both larger- and smaller-than-expected tab icons

Change the logic to scale both larger and smaller icons to the size we want. This seems to fix all the pages I tried, including about:blank, https://duckduckgo.com/, http://gnome.org/, etc.

=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2015-08-10 02:44:13 +0000
+++ midori/midori-notebook.vala	2016-01-23 20:40:13 +0000
@@ -111,7 +111,7 @@
                 // Apply scale factor which is only automatically applied on ThemedIcon
                 icon_width *= scale;
                 icon_height *= scale;
-                if (pixbuf.width > icon_width || pixbuf.height > icon_height)
+                if (pixbuf.width != icon_width || pixbuf.height != icon_height)
                     return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
             }
             return icon;