Instead of baking the status file descriptor into the download_install_manager object, pass it as an argument to the post-install process.

This lets us deal with the fact that due to weirdness in vte, we might
not know the status file descriptor until we're about to invoke dpkg.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ui.cc b/src/ui.cc
index 9032793a..beb6a734 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -1148,10 +1148,10 @@ static void maybe_show_old_tmpdir_message()
 
 namespace
 {
-  pkgPackageManager::OrderResult run_dpkg_with_cwidget_suspended(sigc::slot0<pkgPackageManager::OrderResult> f)
+  pkgPackageManager::OrderResult run_dpkg_with_cwidget_suspended(sigc::slot1<pkgPackageManager::OrderResult, int> f)
   {
     cw::toplevel::suspend();
-    pkgPackageManager::OrderResult rval = f();
+    pkgPackageManager::OrderResult rval = f(-1);
     
     if(rval != pkgPackageManager::Incomplete)
       {
@@ -1174,7 +1174,7 @@ namespace
 
 void install_or_remove_packages()
 {
-  download_install_manager *m = new download_install_manager(false, sigc::ptr_fun(&run_dpkg_with_cwidget_suspended), -1);
+  download_install_manager *m = new download_install_manager(false, sigc::ptr_fun(&run_dpkg_with_cwidget_suspended));
 
   m->post_forget_new_hook.connect(package_states_changed.make_slot());