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

[Stephen Kraemer]

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

[Sebastien Bacher (seb128)]

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

[Brian Murray (brian-murray)]

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

=== 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 @@
                #        this back
                #"--toplevel", "%s" % self.window_main.get_window().get_xid()
                ]
-        self.window_main.set_sensitive(False)
         p = subprocess.Popen(cmd)
-        while p.poll() is None:
-            while Gtk.events_pending():
-                Gtk.main_iteration()
-            time.sleep(0.05)
-        self.window_main.set_sensitive(True)
 
     def set_header(self, label):
         self.label_header.set_label(label)

=== 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 @@
+update-manager (1:0.174.3ubuntu1) UNRELEASED; urgency=low
+
+  * UpdateManager/Dialogs.py: made Settings... button open software-properties non-modally.
+	(LP: #1058070)
+
+ -- Stephen Kraemer <[e-mail]>  Tue, 27 Nov 2012 20:02:58 -0500
+
 update-manager (1:0.174.3) quantal; urgency=low
 
   * UpdateManager/UpdatesAvailable.py: