[geary/f21] Fix toolbar icon size (GNOME 732065)

[Debarshi Ray]

commit 85808a48a48702e10ea080c64f40ead5a9adb52a
Author: Debarshi Ray <debarshir at gnome.org>
Date:   Mon Sep 29 12:46:39 2014 +0200

    Fix toolbar icon size (GNOME 732065)

 ...-toolbar-icon-size-in-GTK-3.14-Bug-732065.patch |   47 ++++++++++++++++++++
 geary.spec                                         |    7 +++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-toolbar-icon-size-in-GTK-3.14-Bug-732065.patch b/0001-Fix-toolbar-icon-size-in-GTK-3.14-Bug-732065.patch
new file mode 100644
index 0000000..6e46573
--- /dev/null
+++ b/0001-Fix-toolbar-icon-size-in-GTK-3.14-Bug-732065.patch
@@ -0,0 +1,47 @@
+From f1fc86f2dbd1ca6b10296744b88267d18d7a25e7 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Thu, 25 Sep 2014 16:46:59 -0700
+Subject: [PATCH] Fix toolbar icon size in GTK+ 3.14: Bug #732065
+
+By setting the icon pixel size, that forces GTK+ to load images
+installed in our locations rather than the theme's.
+---
+ THANKS                                  | 1 +
+ src/client/components/pill-toolbar.vala | 8 +++++++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/THANKS b/THANKS
+index 007ab81..f35d8ad 100644
+--- a/THANKS
++++ b/THANKS
+@@ -5,6 +5,7 @@ Jürg Billeter <j at bitron.ch>
+ Yosef Or Boczko <yoseforb at gmail.com>
+ Martijn Braam <pizzamartijn at gmail.com>
+ Attila Bukor <r1pp3rj4ck at w4it.eu>
++Matthias Clasen <mclasen at redhat.com>
+ Andrea Corbellini <corbellini.andrea at gmail.com>
+ Sergey Shnatsel Davidoff <sergey at elementaryos.org>
+ Joanmarie Diggs <jdiggs at igalia.com>
+diff --git a/src/client/components/pill-toolbar.vala b/src/client/components/pill-toolbar.vala
+index 498236c..1c9a1a9 100644
+--- a/src/client/components/pill-toolbar.vala
++++ b/src/client/components/pill-toolbar.vala
+@@ -38,8 +38,14 @@ public interface PillBar : Gtk.Container {
+         b.related_action = action_group.get_action(action_name);
+         b.tooltip_text = b.related_action.tooltip;
+         b.related_action.notify["tooltip"].connect(() => { b.tooltip_text = b.related_action.tooltip; });
+-        b.image = new Gtk.Image.from_icon_name(icon_name != null ? icon_name :
++        
++        // set pixel size to force GTK+ to load our images from our installed directory, not the theme
++        // directory
++        Gtk.Image image = new Gtk.Image.from_icon_name(icon_name != null ? icon_name :
+             b.related_action.icon_name, Gtk.IconSize.MENU);
++        image.set_pixel_size(16);
++        b.image = image;
++        
+         // Unity buttons are a bit tight
+ #if ENABLE_UNITY
+         b.image.margin = b.image.margin + 4;
+-- 
+2.1.0
+
diff --git a/geary.spec b/geary.spec
index 3a37a6f..da5dbda 100644
--- a/geary.spec
+++ b/geary.spec
@@ -1,11 +1,12 @@
 Name:		geary
 Version:	0.8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A lightweight email program designed around conversations
 License:	LGPLv2+
 URL:		http://yorba.org/geary/
 Source0:	https://download.gnome.org/sources/geary/0.8/%{name}-%{version}.tar.xz
 Patch0:		geary-0.5.3-vapigen.patch
+Patch1:		0001-Fix-toolbar-icon-size-in-GTK-3.14-Bug-732065.patch
 BuildRequires:	vala >= 0.22.1
 BuildRequires:	vala-tools >= 0.22.1
 BuildRequires:	cmake
@@ -49,6 +50,7 @@ all kinds of nifty features in a modular way.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -102,6 +104,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Mon Sep 29 2014 Debarshi Ray <rishi at fedoraproject.org> - 0.8.0-2
+- Fix toolbar icon size (GNOME 732065)
+
 * Fri Sep 19 2014 Thomas Moschny <thomas.moschny at gmx.de> - 0.8.0-1
 - Update to 0.8.0.