[mutter/wip/xinput2b: 31/31] Increase typical icon size to 96

[Jasper St. Pierre <jstpierre src gnome org>]

commit 1cb269374094cd60c166d12c1112a43b1b422cf8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Dec 3 14:58:13 2012 -0500

    Increase typical icon size to 96
    
    Since we want nice alt-tab applications for gnome-shell, we should up the
    limit to 96. In the future, we probably want to get rid of the icon-cache,
    and allow looking up a correctly sized icon directly from the window.
    
    To prevent app breakage, set the legacy WM_HINTS pixmap size directly to
    32x32.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689651

 src/core/screen.c |    8 ++++----
 src/core/window.c |    2 +-
 src/meta/common.h |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/core/screen.c b/src/core/screen.c
index fce73b9..f86f06a 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -312,10 +312,10 @@ set_wm_icon_size_hint (MetaScreen *screen)
   gulong vals[N_VALS];
 
   /* min width, min height, max w, max h, width inc, height inc */
-  vals[0] = META_ICON_WIDTH;
-  vals[1] = META_ICON_HEIGHT;
-  vals[2] = META_ICON_WIDTH;
-  vals[3] = META_ICON_HEIGHT;
+  vals[0] = 32;
+  vals[1] = 32;
+  vals[2] = 32;
+  vals[3] = 32;
   vals[4] = 0;
   vals[5] = 0;
   
diff --git a/src/core/window.c b/src/core/window.c
index 9084e54..79b5a65 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -366,7 +366,7 @@ meta_window_class_init (MetaWindowClass *klass)
                                    PROP_ICON,
                                    g_param_spec_object ("icon",
                                                         "Icon",
-                                                        "32 pixel sized icon",
+                                                        "96 pixel sized icon",
                                                         GDK_TYPE_PIXBUF,
                                                         G_PARAM_READABLE));
 
diff --git a/src/meta/common.h b/src/meta/common.h
index 63ffc5f..f32a0a6 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -300,8 +300,8 @@ struct _MetaFrameBorders
 void meta_frame_borders_clear (MetaFrameBorders *self);
 
 /* should investigate changing these to whatever most apps use */
-#define META_ICON_WIDTH 32
-#define META_ICON_HEIGHT 32
+#define META_ICON_WIDTH 96
+#define META_ICON_HEIGHT 96
 #define META_MINI_ICON_WIDTH 16
 #define META_MINI_ICON_HEIGHT 16