[geary/wip/732065-icons] Tweaks

[Jim Nelson <jnelson src gnome org>]

commit 3f4f4cca8304aecf2ef7c77bba60fdfdae893057
Author: Jim Nelson <jim yorba org>
Date:   Fri Oct 3 14:32:55 2014 -0700

    Tweaks

 src/client/components/icon-factory.vala |    5 ++---
 src/client/components/pill-toolbar.vala |    3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/client/components/icon-factory.vala b/src/client/components/icon-factory.vala
index a387795..6277d8a 100644
--- a/src/client/components/icon-factory.vala
+++ b/src/client/components/icon-factory.vala
@@ -123,6 +123,8 @@ public class IconFactory {
             icon_theme.lookup_icon("document-symbolic", size, flags);
     }
     
+    // GTK+ 3.14 no longer scales icons via the IconInfo, so perform manually until we
+    // properly install the icons as per 3.14's expectations.
     private Gdk.Pixbuf aspect_scale_down_pixbuf(Gdk.Pixbuf pixbuf, int size) {
         if (pixbuf.width <= size && pixbuf.height <= size)
             return pixbuf;
@@ -138,9 +140,6 @@ public class IconFactory {
             scaled_height = size;
         }
         
-        debug("scale pixbuf: %dx%d size:%d => %dx%d", pixbuf.width, pixbuf.height, size,
-            scaled_width, scaled_height);
-        
         return pixbuf.scale_simple(scaled_width, scaled_height, Gdk.InterpType.BILINEAR);
     }
     
diff --git a/src/client/components/pill-toolbar.vala b/src/client/components/pill-toolbar.vala
index f5ea032..b4ea51d 100644
--- a/src/client/components/pill-toolbar.vala
+++ b/src/client/components/pill-toolbar.vala
@@ -57,7 +57,8 @@ public interface PillBar : Gtk.Container {
         
         // Unity buttons are a bit tight
 #if ENABLE_UNITY
-        b.image.margin = b.image.margin + 4;
+        if (b.image != null)
+            b.image.margin = b.image.margin + 4;
 #endif
         b.always_show_image = true;