Merge lp:~ilidrissi.amine/ubuntu/maverick/gnome-codec-install/fix-bug-615508 into lp:ubuntu/maverick/gnome-codec-install

[Mohamed Amine Ilidrissi]

=== modified file 'GnomeCodecInstall/PackageWorker.py'
--- GnomeCodecInstall/PackageWorker.py	2010-07-16 12:13:01 +0000
+++ GnomeCodecInstall/PackageWorker.py	2010-08-31 14:53:43 +0000
@@ -34,13 +34,22 @@
 
 class PackageWorkerAptdaemon(PackageWorker):
 
+  (RESULT_SUCCESS, RESULT_FAILURE, RESULT_NOTKNOWN) = range(3)
+  
   def __init__(self):
     self.client = client.AptClient()
-    self._result = None
+    self._result = self.RESULT_NOTKNOWN
 
   def perform_action(self, parent_window, install, remove):
     self._perform_action(parent_window, install, remove)
-    return self._result
+    while self._result == self.RESULT_NOTKNOWN:
+      while gtk.events_pending():
+        gtk.main_iteration()
+      time.sleep(0.01)
+    if self._result == self.RESULT_SUCCESS:
+        return True
+    else:
+        return False
 
   @inline_callbacks
   def _perform_action(self, parent_window, install, remove):
@@ -61,14 +70,10 @@
     dia = AptProgressDialog(trans, parent=parent_window)
     dia.connect("finished", self._on_finished)
     dia.run()
-    while self._result is None:
-      while gtk.events_pending():
-        gtk.main_iteration()
-      time.sleep(0.01)
 
   def _on_finished(self, dialog):
     dialog.hide()
-    self._result = True
+    self._result = self.RESULT_SUCCESS
 
 
 class PackageWorkerSynaptic(PackageWorker):

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-16 12:13:01 +0000
+++ debian/changelog	2010-08-31 14:53:43 +0000
@@ -1,3 +1,10 @@
+gnome-codec-install (0.4.7ubuntu2) maverick; urgency=low
+
+  * GnomeCodecInstall/PackageWorker.py: Aptdaemon now installs then
+    returns a result (LP: #615508)
+
+ -- Mohamed Amine IL Idrissi <[e-mail]>  Tue, 31 Aug 2010 14:50:09 +0000
+
 gnome-codec-install (0.4.7ubuntu1) maverick; urgency=low
 
   * Merge with Debian unstable, remaining Ubuntu changes: