r21484 - in /packages/unstable/update-manager/debian: changelog patches/ patches/01_fix_unclosable_ui_r1556.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Sep 24 10:00:50 2009
New Revision: 21484

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21484
Log:
* debian/patches/01_fix_unclosable_ui_r1556.patch:
  - Patch from Stephan Peijnik to make Close button work again.
    Closes: #548063.

Added:
    packages/unstable/update-manager/debian/patches/
    packages/unstable/update-manager/debian/patches/01_fix_unclosable_ui_r1556.patch
Modified:
    packages/unstable/update-manager/debian/changelog

Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=21484&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog [utf-8] (original)
+++ packages/unstable/update-manager/debian/changelog [utf-8] Thu Sep 24 10:00:50 2009
@@ -1,5 +1,6 @@
-update-manager (0.200.0~rc4-1) unstable; urgency=low
-
+update-manager (0.200.0~rc4-1) UNRELEASED; urgency=low
+
+  [ Stephan Peijnik ]
   * New upstream release.
   * Fixed fetch dialog resizing problem.
   * Fixed main window default size.
@@ -10,6 +11,11 @@
   * Updated russion translation (Closes: #546491).
   * Fixed gksu wrong desktop file path problem in GtkCommon frontend code.
   * Fixed spelling of safe-upgrade dialog (Closes: #547477).
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/01_fix_unclosable_ui_r1556.patch:
+    - Patch from Stephan Peijnik to make Close button work again.
+      Closes: #548063.
 
  -- Stephan Peijnik <debian at sp.or.at>  Mon, 21 Sep 2009 11:32:44 +0200
 

Added: packages/unstable/update-manager/debian/patches/01_fix_unclosable_ui_r1556.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/patches/01_fix_unclosable_ui_r1556.patch?rev=21484&op=file
==============================================================================
--- packages/unstable/update-manager/debian/patches/01_fix_unclosable_ui_r1556.patch (added)
+++ packages/unstable/update-manager/debian/patches/01_fix_unclosable_ui_r1556.patch [utf-8] Thu Sep 24 10:00:50 2009
@@ -1,0 +1,64 @@
+=== modified file 'UpdateManager/Frontend/Gtk/ui.py'
+--- UpdateManager/Frontend/Gtk/ui.py	2009-09-21 09:20:12 +0000
++++ UpdateManager/Frontend/Gtk/ui.py	2009-09-23 21:06:47 +0000
+@@ -604,6 +604,7 @@
+         self._frontend = frontend
+         self._application = None
+         self._dist_upgrade = None
++        self._package_list_update = False
+         self.dbus_controller = None
+         self.setup_dbus()
+         
+@@ -770,6 +771,12 @@
+ 
+     def update_package_list(self):
+         """ Package list updater. """
++        if self._package_list_update:
++            LOG.debug('Update already running...')
++            return
++        else:
++            self._package_list_update = True
++            
+         self.button_install.set_sensitive(False)
+         LOG.debug("Updating treeview.")
+         self.label_header.set_markup(
+@@ -781,8 +788,11 @@
+ 
+         # Make sure all gtk events have been processed and the store is
+         # actually empty before moving on...
+-        while gtk.events_pending() or not self.update_list.store_is_empty():
+-            gtk.main_iteration()
++        while not self.update_list.store_is_empty():
++            if gtk.events_pending():
++                gtk.main_iteration()
++            else:
++                time.sleep(0.2)
+ 
+         self.set_busy_status()
+         want_dist_upgrade = self._dist_upgrade
+@@ -806,6 +816,7 @@
+ 
+             dialog.show_all()
+             res = dialog.run()
++            
+             dialog.hide_all()
+             del dialog
+             
+@@ -814,7 +825,7 @@
+                 # The UI really needs to be updated here, so let's wait for
+                 # gtk.
+                 while gtk.events_pending():
+-                    gtk.main_iteration()
++                    gtk.main_iteration(block=False)
+                 pkg_info_store = self._application.get_available_updates(
+                     self._dist_upgrade)
+             else:
+@@ -894,6 +905,7 @@
+         self.label_header.set_markup(text_header)
+         self.label_main_details.set_text(text_label_main)
+         self.update_install_button()
++        self._package_list_update = False
+         gobject.idle_add(self.clear_busy_status)
+ 
+     def update_install_button(self):
+