Merge lp:~dobey/ubuntu/lucid/ubuntuone-client/fix-567223 into lp:ubuntu/lucid/ubuntuone-client

[dobey]

Quick patch to fix #567223. Already approved/committed upstream.

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-20 14:43:08 +0000
+++ debian/changelog	2010-04-21 20:44:17 +0000
@@ -1,3 +1,10 @@
+ubuntuone-client (1.2.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add fix-567223.patch.
+    - Fixes gtk.MODAL usage and dialog closure. (LP: #567223)
+
+ -- Rodney Dawes <[e-mail]>  Wed, 21 Apr 2010 16:38:34 -0400
+
 ubuntuone-client (1.2.1-0ubuntu1) lucid; urgency=low
 
   * New upstream release.
 
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-567223.patch'
--- debian/patches/fix-567223.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-567223.patch	2010-04-21 20:44:17 +0000
@@ -0,0 +1,22 @@
+=== modified file 'bin/ubuntuone-preferences'
+--- bin/ubuntuone-preferences	2010-04-19 14:37:13 +0000
++++ bin/ubuntuone-preferences	2010-04-21 18:54:16 +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()
+ 
+
 
=== modified file 'debian/rules'
--- debian/rules	2010-04-19 21:24:37 +0000
+++ debian/rules	2010-04-21 20:44:17 +0000
@@ -3,6 +3,7 @@
 DEB_PYTHON_SYSTEM = pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk