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

Proposed by Bilal Akhtar
Status: Merged
Merge reported by: Bilal Akhtar
Merged at revision: not available
Proposed branch: lp:~bilalakhtar/ubuntu/maverick/gnome-disk-utility/fix-414107
Merge into: lp:ubuntu/maverick/gnome-disk-utility
Diff against target: 71 lines (+40/-1)
4 files modified
debian/changelog (+9/-0)
debian/control (+2/-1)
debian/patches/02_add_scrolled_window.patch (+28/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~bilalakhtar/ubuntu/maverick/gnome-disk-utility/fix-414107
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+32966@code.launchpad.net

Description of the change

Patch fixes bug #414107 .

To post a comment you must log in.
24. By Bilal Akhtar

Ran Update-maintainer

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1gnome-disk-utility (2.30.1-1ubuntu1) maverick; urgency=low
2
3 * debian/patches/02_add_scrolled_window.patch:
4 - Add a scrolled window as a parent to the main VBox in the application
5 to make it more accessible from computers having smaller screens.
6 Thanks to David Chang for the initial patch. (LP: #414107)
7
8 -- Bilal Akhtar <bilalakhtar@ubuntu.com> Wed, 18 Aug 2010 11:48:17 +0300
9
1gnome-disk-utility (2.30.1-1) unstable; urgency=low10gnome-disk-utility (2.30.1-1) unstable; urgency=low
211
3 * New upstream release:12 * New upstream release:
413
=== 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 @@
1Source: gnome-disk-utility1Source: gnome-disk-utility
2Section: admin2Section: admin
3Priority: optional3Priority: optional
4Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
5Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>6Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
6Build-Depends: debhelper (>= 7),7Build-Depends: debhelper (>= 7),
7 cdbs,8 cdbs,
89
=== 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 @@
1Description: Patch to make application better for small screens
2 This patch adds a scrolled window to the main VBox of the application
3 to make it accessible with computers having small screens.
4Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
5Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gnome-disk-utility/+bug/414107
6Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589502
7Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=594088
8--- a/src/palimpsest/gdu-shell.c
9+++ b/src/palimpsest/gdu-shell.c
10@@ -1096,6 +1096,7 @@
11 GtkAccelGroup *accel_group;
12 GtkWidget *hpane;
13 GtkWidget *tree_view_scrolled_window;
14+ GtkWidget *hpane_right_scrolled_window;
15 GtkTreeSelection *select;
16 GtkWidget *label;
17 GtkTreeViewColumn *column;
18@@ -1153,7 +1154,9 @@
19
20 shell->priv->sections_vbox = gtk_vbox_new (FALSE, 12);
21 gtk_container_set_border_width (GTK_CONTAINER (shell->priv->sections_vbox), 6);
22- gtk_box_pack_start (GTK_BOX (vbox2), shell->priv->sections_vbox, TRUE, TRUE, 0);
23+ hpane_right_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
24+ gtk_scrolled_window_add_with_viewport(hpane_right_scrolled_window, shell->priv->sections_vbox);
25+ gtk_box_pack_start (GTK_BOX (vbox2), hpane_right_scrolled_window, TRUE, TRUE, 0);
26
27 /* setup and add horizontal pane */
28 hpane = gtk_hpaned_new ();
029
=== 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 @@
1# Debian patches for gnome-disk-utility1# Debian patches for gnome-disk-utility
201_delay_autostart.patch201_delay_autostart.patch
302_add_scrolled_window.patch

Subscribers

People subscribed via source and target branches

to all changes: