Merge lp:~straemer/ubuntu/quantal/update-manager/fix-for-1058070 into lp:ubuntu/quantal/update-manager

Proposed by Stephen Kraemer
Status: Merged
Merge reported by: Stéphane Graber
Merged at revision: not available
Proposed branch: lp:~straemer/ubuntu/quantal/update-manager/fix-for-1058070
Merge into: lp:ubuntu/quantal/update-manager
Diff against target: 32 lines (+7/-6)
2 files modified
UpdateManager/Dialogs.py (+0/-6)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~straemer/ubuntu/quantal/update-manager/fix-for-1058070
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Ubuntu branches Pending
Review via email: mp+136551@code.launchpad.net

Description of the change

Made Settings... open software-properties non-modally.

Depends on this merge to make sense: https://code.launchpad.net/~straemer/ubuntu/quantal/software-properties/fix-for-1058070/+merge/136547

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for your work and sorry for the review time, the change looks fine, is there any way you could retarget the destination vcs to lp:update-manager though (which is the upstream code location)?

review: Needs Fixing
Revision history for this message
Brian Murray (brian-murray) wrote :

I went ahead and did the work of merging this into lp:update-manager.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py 2012-08-24 19:05:38 +0000
+++ UpdateManager/Dialogs.py 2012-11-28 01:08:21 +0000
@@ -90,13 +90,7 @@
90 # this back90 # this back
91 #"--toplevel", "%s" % self.window_main.get_window().get_xid()91 #"--toplevel", "%s" % self.window_main.get_window().get_xid()
92 ]92 ]
93 self.window_main.set_sensitive(False)
94 p = subprocess.Popen(cmd)93 p = subprocess.Popen(cmd)
95 while p.poll() is None:
96 while Gtk.events_pending():
97 Gtk.main_iteration()
98 time.sleep(0.05)
99 self.window_main.set_sensitive(True)
10094
101 def set_header(self, label):95 def set_header(self, label):
102 self.label_header.set_label(label)96 self.label_header.set_label(label)
10397
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-10 10:21:50 +0000
+++ debian/changelog 2012-11-28 01:08:21 +0000
@@ -1,3 +1,10 @@
1update-manager (1:0.174.3ubuntu1) UNRELEASED; urgency=low
2
3 * UpdateManager/Dialogs.py: made Settings... button open software-properties non-modally.
4 (LP: #1058070)
5
6 -- Stephen Kraemer <straemer@gmail.com> Tue, 27 Nov 2012 20:02:58 -0500
7
1update-manager (1:0.174.3) quantal; urgency=low8update-manager (1:0.174.3) quantal; urgency=low
29
3 * UpdateManager/UpdatesAvailable.py:10 * UpdateManager/UpdatesAvailable.py:

Subscribers

People subscribed via source and target branches