Unity

Merge lp:~azzar1/unity/lp-1404730 into lp:unity

  1. lp-1404730
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3910
Proposed branch: lp:~azzar1/unity/lp-1404730
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
unity-shared/IconLoader.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1404730
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+246579@code.launchpad.net

Commit message

Force icon size (new gtk requires it).

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'unity-shared/IconLoader.cpp'
--- unity-shared/IconLoader.cpp 2014-03-21 01:49:22 +0000
+++ unity-shared/IconLoader.cpp 2015-01-15 14:36:29 +0000
@@ -234,7 +234,7 @@
234 else if (icon.IsType(G_TYPE_ICON))234 else if (icon.IsType(G_TYPE_ICON))
235 {235 {
236 GtkIconInfo *info = ::gtk_icon_theme_lookup_by_gicon(impl->theme_, icon, size,236 GtkIconInfo *info = ::gtk_icon_theme_lookup_by_gicon(impl->theme_, icon, size,
237 static_cast<GtkIconLookupFlags>(0));237 static_cast<GtkIconLookupFlags>(GTK_ICON_LOOKUP_FORCE_SIZE));
238 if (info)238 if (info)
239 {239 {
240 icon_info = info;240 icon_info = info;