[Aptitude-svn-commit] r4340 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 29 23:05:43 2005
New Revision: 4340

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui_download_manager.cc
Log:
Use both ui_start_download and ui_stop_download.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 29 23:05:43 2005
@@ -1,5 +1,9 @@
 2005-09-29  Daniel Burrows  <dburrows at debian.org>
 
+	* src/ui_download_manager.cc:
+
+	  Actually use both ui_start_download and ui_stop_download.
+
 	* src/ui.cc, src/generic/download_install_manager.cc, src/generic/download_update_manager.cc:
 
 	  Implement the before/after hooks in the UI to shut down curses

Modified: branches/aptitude-0.3/aptitude/src/ui_download_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui_download_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui_download_manager.cc	Thu Sep 29 23:05:43 2005
@@ -29,10 +29,6 @@
 
 #include <sigc++/functors/mem_fun.h>
 
-// HACK.  Should these be explicitly exported from UI?
-extern bool active_download;
-extern vs_widget_ref active_preview;
-
 ui_download_manager::ui_download_manager(download_manager *_manager)
   : manager(_manager),
     t(NULL),
@@ -52,9 +48,7 @@
   log->Complete();
   delete manager;
 
-  active_download = false;
-  if(apt_cache_file != NULL)
-    (*apt_cache_file)->set_read_only(false);
+  ui_stop_download();
 
   abort_state.abort();