[control-center/f20] Fix icon views to have 6 columns

[Matthias Clasen]

commit 7bc798ca9b7508e2a3c37d49fb49f6f54dfc3e10
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Nov 26 16:43:45 2013 -0500

    Fix icon views to have 6 columns

 ...shell-Set-iconview-number-of-columns-to-6.patch |   26 ++++++++++++++++++++
 control-center.spec                                |    9 ++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-shell-Set-iconview-number-of-columns-to-6.patch b/0001-shell-Set-iconview-number-of-columns-to-6.patch
new file mode 100644
index 0000000..6eddae4
--- /dev/null
+++ b/0001-shell-Set-iconview-number-of-columns-to-6.patch
@@ -0,0 +1,26 @@
+From 56d88c35b17d93b173cafa62aa9cd7c65888f99b Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Tue, 26 Nov 2013 15:25:41 +0100
+Subject: [PATCH] shell: Set iconview number of columns to 6
+
+This ensures that the overview page keeps its size and doesn't grow
+wider than it should be.
+---
+ shell/cc-shell-category-view.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
+index 4b05d8c..d7094ab 100644
+--- a/shell/cc-shell-category-view.c
++++ b/shell/cc-shell-category-view.c
+@@ -138,6 +138,7 @@ cc_shell_category_view_constructed (GObject *object)
+   gtk_icon_view_set_text_column (GTK_ICON_VIEW (iconview), COL_NAME);
+   gtk_icon_view_set_item_width (GTK_ICON_VIEW (iconview), 100);
+   cc_shell_item_view_update_cells (CC_SHELL_ITEM_VIEW (iconview));
++  gtk_icon_view_set_columns (GTK_ICON_VIEW (iconview), 6);
+ 
+   /* create the header if required */
+   if (priv->name)
+-- 
+1.8.4.2
+
diff --git a/control-center.spec b/control-center.spec
index 2e9bd44..8fa3ce4 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -12,7 +12,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 3.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 #VCS: git:git://git.gnome.org/gnome-control-center
@@ -22,6 +22,9 @@ URL: http://www.gnome.org
 # https://bugzilla.gnome.org/show_bug.cgi?id=695691
 Patch0: distro-logo.patch
 
+# upstream fix
+Patch1: 0001-shell-Set-iconview-number-of-columns-to-6.patch
+
 Requires: gnome-settings-daemon >= %{gsd_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
@@ -134,6 +137,7 @@ utilities.
 %prep
 %setup -q -n gnome-control-center-%{version}
 %patch0 -p1 -b .distro-logo
+%patch1 -p1 -b .window-size
 
 %build
 autoreconf
@@ -222,6 +226,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Nov 26 2013 Matthias Clasen <mclasen at redhat.com> - 1:3.10.2-3
+- Fix the icon views to 6 columns
+
 * Wed Nov 13 2013 Bastien Nocera <bnocera at redhat.com> - 1:3.10.2-2
 - Add vino dependency