Merge lp:~bilalakhtar/ubuntu/maverick/gnome-disk-utility/fix-414107 into lp:ubuntu/maverick/gnome-disk-utility

[Bilal Akhtar]

Patch fixes bug #414107 .

[lp:~bilalakhtar/ubuntu/maverick/gnome-disk-utility/fix-414107]

24. By Bilal Akhtar on 2010-08-18

Ran Update-maintainer

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-04 23:58:54 +0000
+++ debian/changelog	2010-08-18 09:07:46 +0000
@@ -1,3 +1,12 @@
+gnome-disk-utility (2.30.1-1ubuntu1) maverick; urgency=low
+
+  * debian/patches/02_add_scrolled_window.patch:
+    - Add a scrolled window as a parent to the main VBox in the application
+      to make it more accessible from computers having smaller screens.
+      Thanks to David Chang for the initial patch. (LP: #414107)
+
+ -- Bilal Akhtar <[e-mail]>  Wed, 18 Aug 2010 11:48:17 +0300
+
 gnome-disk-utility (2.30.1-1) unstable; urgency=low
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2010-03-16 14:56:07 +0000
+++ debian/control	2010-08-18 09:07:46 +0000
@@ -1,7 +1,8 @@
 Source: gnome-disk-utility
 Section: admin
 Priority: optional
-Maintainer: Utopia Maintenance Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Utopia Maintenance Team <[e-mail]>
 Uploaders: Michael Biebl <[e-mail]>, Martin Pitt <[e-mail]>
 Build-Depends: debhelper (>= 7),
  cdbs,

=== added file 'debian/patches/02_add_scrolled_window.patch'
--- debian/patches/02_add_scrolled_window.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_add_scrolled_window.patch	2010-08-18 09:07:46 +0000
@@ -0,0 +1,28 @@
+Description: Patch to make application better for small screens
+ This patch adds a scrolled window to the main VBox of the application
+ to make it accessible with computers having small screens.
+Author: Bilal Akhtar <[e-mail]>
+Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gnome-disk-utility/+bug/414107
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589502
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=594088
+--- a/src/palimpsest/gdu-shell.c
++++ b/src/palimpsest/gdu-shell.c
+@@ -1096,6 +1096,7 @@
+         GtkAccelGroup *accel_group;
+         GtkWidget *hpane;
+         GtkWidget *tree_view_scrolled_window;
++        GtkWidget *hpane_right_scrolled_window;
+         GtkTreeSelection *select;
+         GtkWidget *label;
+         GtkTreeViewColumn *column;
+@@ -1153,7 +1154,9 @@
+ 
+         shell->priv->sections_vbox = gtk_vbox_new (FALSE, 12);
+         gtk_container_set_border_width (GTK_CONTAINER (shell->priv->sections_vbox), 6);
+-        gtk_box_pack_start (GTK_BOX (vbox2), shell->priv->sections_vbox, TRUE, TRUE, 0);
++        hpane_right_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
++        gtk_scrolled_window_add_with_viewport(hpane_right_scrolled_window, shell->priv->sections_vbox);
++        gtk_box_pack_start (GTK_BOX (vbox2), hpane_right_scrolled_window, TRUE, TRUE, 0);
+ 
+         /* setup and add horizontal pane */
+         hpane = gtk_hpaned_new ();

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-15 08:36:50 +0000
+++ debian/patches/series	2010-08-18 09:07:46 +0000
@@ -1,2 +1,3 @@
 # Debian patches for gnome-disk-utility
 01_delay_autostart.patch
+02_add_scrolled_window.patch