Merge lp:~dobey/ubuntuone-client/error-dialog-errors into lp:ubuntuone-client

[dobey]

Use the correct MODAL flag to avoid AttributeError
Use a try/finally to destroy the dialog when closed

[John Lenton (chipaca)]

 review approve

review: Approve

[Rick McBride (rmcbride)]

+1

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-04-19 14:37:13 +0000
+++ bin/ubuntuone-preferences	2010-04-21 19:23:15 +0000
@@ -301,11 +301,15 @@
         """
         logger.error(msg)
         dialog = gtk.MessageDialog(self.get_toplevel(),
-                                   gtk.DIALOG_DESTROY_WITH_PARENT | gtk.MODAL,
+                                   gtk.DIALOG_DESTROY_WITH_PARENT | 
+                                   gtk.DIALOG_MODAL,
                                    gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE,
                                    'Error')
         dialog.format_secondary_text(str(msg))
-        dialog.run()
+        try:
+            dialog.run()
+        finally:
+            dialog.destroy()
         while gtk.events_pending():
             gtk.main_iteration()