Merge lp:~jbicha/ubuntu/oneiric/gnome-control-center/make-it-wider into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Jeremy Bícha]

Unfortunately, this makes some of the panels look too stretched out.

On the other hand this patch saves 2 rows on the front page in current Oneric and makes the front page look a lot better proportioned. Previously, I had to vertically scroll on my 1280x800 screen, which is not an uncommon laptop screen size.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-25 14:39:41 +0000
+++ debian/changelog	2011-08-29 05:41:44 +0000
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.1.5-0ubuntu5) oneiric; urgency=low
+
+  * debian/patches/07_make_window_wider.patch
+    - Make the System Settings window a bit wider to reduce need for scrolling
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 29 Aug 2011 01:28:14 -0400
+
 gnome-control-center (1:3.1.5-0ubuntu4) oneiric; urgency=low
 
   * debian/patches/04_add_theme_selection.patch:

=== added file 'debian/patches/07_make_window_wider.patch'
--- debian/patches/07_make_window_wider.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/07_make_window_wider.patch	2011-08-29 05:41:44 +0000
@@ -0,0 +1,13 @@
+Index: gnome-control-center-3.1.5/shell/gnome-control-center.c
+===================================================================
+--- gnome-control-center-3.1.5.orig/shell/gnome-control-center.c	2011-08-28 23:38:09.023225450 -0400
++++ gnome-control-center-3.1.5/shell/gnome-control-center.c	2011-08-28 23:38:18.173238867 -0400
+@@ -81,7 +81,7 @@
+ 
+ /* Use a fixed width for the shell, since resizing horizontally is more awkward
+  * for the user than resizing vertically */
+-#define FIXED_WIDTH 675
++#define FIXED_WIDTH 740
+ 
+ 
+ static const gchar *

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-25 14:39:41 +0000
+++ debian/patches/series	2011-08-29 05:41:44 +0000
@@ -6,3 +6,4 @@
 #50_ubuntu_systemwide_prefs.patch
 #51_ubuntu_system_keyboard.patch
 06_handle_passwd_with_ldap.patch
+07_make_window_wider.patch