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

[Daniel Burrows]

Author: dburrows
Date: Sat Aug  6 15:26:27 2005
New Revision: 3715

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_item.cc
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Always destroy progress bars when they're no longer necessary.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Aug  6 15:26:27 2005
@@ -1,4 +1,10 @@
-2005-08-05  Daniel Burrows  <dburrows at debian.org>
+2005-08-06  Daniel Burrows  <dburrows at debian.org>
+
+	* src/pkg_item.cc, src/pkg_ver_item.cc, src/ui.cc:
+
+	  Always destroy progress bars when we're done with them, so they
+	  don't leak and hang around taking up space (in the past they
+	  just leaked silently, but now they also make stuff look bad!)
 
 	* src/vscreen/vscreen.cc, src/vscreen/vscreen.h, src/vscreen/vscreen_widget.h:
 
@@ -7,6 +13,8 @@
 	  don't want to reset the signals for some reason, you can use
 	  vscreen_suspend_without_signals().  (Closes: #137311, #169479)
 
+2005-08-05  Daniel Burrows  <dburrows at debian.org>
+
 	* src/generic/aptcache.cc:
 
 	  Always save the version to be installed, so long as it's a

Modified: branches/aptitude-0.3/aptitude/src/pkg_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_item.cc	Sat Aug  6 15:26:27 2005
@@ -395,7 +395,9 @@
 
       vscreen_resume();
 
-      apt_reload_cache(gen_progress_bar(), true);
+      vs_progress *p = gen_progress_bar();
+      apt_reload_cache(p, true);
+      p->destroy();
     }
   else if(bindings->key_matches(k, "DpkgReconfigure"))
     // Don't bother with my internal su-to-root stuff here, since I don't
@@ -435,7 +437,9 @@
 	      vscreen_resume();
 	    }
 
-	  apt_reload_cache(gen_progress_bar(), true);
+	  vs_progress *p = gen_progress_bar();
+	  apt_reload_cache(p, true);
+	  p->destroy();
 	}
     }
   else if(bindings->key_matches(k, "EditHier"))

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	Sat Aug  6 15:26:27 2005
@@ -744,7 +744,9 @@
 
       vscreen_resume();
 
-      apt_reload_cache(gen_progress_bar(), true);
+      vs_progress *p = gen_progress_bar();
+      apt_reload_cache(p, true);
+      p->destroy();
 
       return true;
     }

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Sat Aug  6 15:26:27 2005
@@ -357,7 +357,10 @@
 	  vscreen_resume();
 	  check_apt_errors();
 	  // We have to clear these out or the cache won't reload properly (?)
-	  apt_reload_cache(gen_progress_bar(), true);
+
+	  vs_progress *p = gen_progress_bar();
+	  apt_reload_cache(p, true);
+	  p->destroy();
 	}
       else
 	exit(0);
@@ -1284,7 +1287,9 @@
 #ifdef WITH_RELOAD_CACHE
 static void do_reload_cache()
 {
-  apt_reload_cache(gen_progress_bar(), true);
+  vs_progress *p = gen_progress_bar();
+  apt_reload_cache(p, true);
+  p->destroy();
 }
 #endif