Merge lp:~dobey/ubuntuone-client/fix-553318 into lp:ubuntuone-client

[dobey]

Call main_quit in a timeout, so the handle_bw_controls_changed timeout doesn't
  get ignored when closing the dialog

[John O'Brien (jdobrien)]

review: Approve

[lp:~dobey/ubuntuone-client/fix-553318]

473. By dobey on 2010-04-01

Always list devices to avoid AttributeError if closed before devices found
Only present the window if it's visible, to avoid showing the closed dialog

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-04-01 17:22:13 +0000
+++ bin/ubuntuone-preferences	2010-04-01 19:12:34 +0000
@@ -597,7 +597,7 @@
         """Handle the dialog's response."""
         self.hide()
         self.devices.handle_bw_controls_changed()
-        gtk.main_quit()
+        gobject.timeout_add_seconds(5, gtk.main_quit)
 
     def _format_for_gb_display(self, bytes):
         """Format bytes into reasonable gb display."""
@@ -957,6 +957,7 @@
         sw.show()
         self.devices = DevicesWidget(self.__bus, self.keyring)
         sw.add_with_viewport(self.devices)
+        self.devices.list_devices()
         self.devices.show_all()
 
         # Services tab
@@ -1058,7 +1059,8 @@
         self.dialog.request_quota_info()
         self.dialog.request_account_info()
         self.dialog.devices.get_devices()
-        self.dialog.present_with_time(int(time.time()))
+        if self.dialog.visible:
+            self.dialog.present_with_time(int(time.time()))
 
     def got_newcredentials(self, realm, consumer_key):
         """Show our dialog, since we can do stuff now."""