Hello community, here is the log from the commit of package geary for openSUSE:Factory checked in at 2014-10-01 11:23:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geary (Old) and /work/SRC/openSUSE:Factory/.geary.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geary" Changes: -------- --- /work/SRC/openSUSE:Factory/geary/geary.changes 2014-09-22 09:24:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2014-10-01 11:23:42.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 27 15:04:49 UTC 2014 - zaitor@opensuse.org + +- Add geary-fix-toolbar-icons.patch: Fix oversized icons in toolbar + (bgo#732065). + +------------------------------------------------------------------- New: ---- geary-fix-toolbar-icons.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geary.spec ++++++ --- /var/tmp/diff_new_pack.CRsTBf/_old 2014-10-01 11:23:43.000000000 +0200 +++ /var/tmp/diff_new_pack.CRsTBf/_new 2014-10-01 11:23:43.000000000 +0200 @@ -24,12 +24,14 @@ Group: Productivity/Networking/Email/Clients Url: http://yorba.org/geary Source: http://download.gnome.org/sources/geary/0.8/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM geary-fix-toolbar-icons.patch bgo#732065 zaitor@opensuse.org -- Fix oversized icons in toolbar when compiled with gtk3 >= 3.13 +Patch0: geary-fix-toolbar-icons.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xml2po -BuildRequires: pkgconfig(gcr-3) +BuildRequires: pkgconfig(gcr-3) >= 3.10.1 BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 BuildRequires: pkgconfig(gio-2.0) >= 2.28.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 @@ -57,6 +59,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake -DVALA_EXECUTABLE:FILEPATH=%{_bindir}/valac%{?vala_version_suffix} \ ++++++ geary-fix-toolbar-icons.patch ++++++

From f1fc86f2dbd1ca6b10296744b88267d18d7a25e7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen <mclasen@redhat.com> Date: Thu, 25 Sep 2014 16:46:59 -0700 Subject: 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. diff --git a/THANKS b/THANKS index 007ab81..f35d8ad 100644 --- a/THANKS +++ b/THANKS @@ -5,6 +5,7 @@ Jürg Billeter <j@bitron.ch> Yosef Or Boczko <yoseforb@gmail.com> Martijn Braam <pizzamartijn@gmail.com> Attila Bukor <r1pp3rj4ck@w4it.eu> +Matthias Clasen <mclasen@redhat.com> Andrea Corbellini <corbellini.andrea@gmail.com> Sergey Shnatsel Davidoff <sergey@elementaryos.org> Joanmarie Diggs <jdiggs@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; -- cgit v0.10.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org