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

[Daniel Burrows]

Author: dburrows
Date: Sat Oct  1 01:52:33 2005
New Revision: 4400

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
   branches/aptitude-0.3/aptitude/src/ui_download_manager.cc
   branches/aptitude-0.3/aptitude/src/ui_download_manager.h
Log:
Fix more compile problems.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Oct  1 01:52:33 2005
@@ -1,5 +1,9 @@
 2005-09-30  Daniel Burrows  <dburrows at debian.org>
 
+	* src/ui.cc, src/ui_download_manager.cc, src/ui_download_manager.h:
+
+	  Fix more compile problems.
+
 	* src/download_list.cc, src/download_list.h:
 
 	  Fix compilation errors.

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 Oct  1 01:52:33 2005
@@ -2547,7 +2547,7 @@
   m->Complete_sig.connect(sigc::mem_fun(w.unsafe_get_ref(),
 					&download_list::Complete));
 
-  return std::pair<download_manager *, vs_widget_ref>(m, w);
+  return std::pair<download_signal_log *, vs_widget_ref>(m, w);
 }
 
 static void do_prompt_string(const wstring &s,
@@ -2558,12 +2558,13 @@
   realslot();
 }
 
-download_signal_log *gen_download_progress(bool force_noninvasive,
-					   bool list_update,
-					   const string &title,
-					   const string &longtitle,
-					   const string &tablabel,
-					   slot0arg abortslot)
+std::pair<download_signal_log *, vs_widget_ref>
+gen_download_progress(bool force_noninvasive,
+		      bool list_update,
+		      const string &title,
+		      const string &longtitle,
+		      const string &tablabel,
+		      slot0arg abortslot)
 {
   return gen_download_progress(force_noninvasive,
 			       list_update,

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	Sat Oct  1 01:52:33 2005
@@ -29,6 +29,8 @@
 
 #include <sigc++/functors/mem_fun.h>
 
+#include <vscreen/vscreen_widget.h> // For vs_widget_ref
+
 ui_download_manager::ui_download_manager(download_manager *_manager,
 					 bool force_noninvasive,
 					 bool list_update,
@@ -88,7 +90,7 @@
 {
   vs_progress_ref p = gen_progress_bar();
 
-  bool ok = manager->prepare(*p.unsafe_get_ref(), st, log);
+  bool ok = manager->prepare(*p.unsafe_get_ref(), *st, log);
 
   p->destroy();
 

Modified: branches/aptitude-0.3/aptitude/src/ui_download_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui_download_manager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/ui_download_manager.h	Sat Oct  1 01:52:33 2005
@@ -27,11 +27,14 @@
 
 #include <apt-pkg/acquire.h>
 
+#include <vscreen/ref_ptr.h>
+
 #include <sigc++/trackable.h>
 
 class download_manager;
 class download_signal_log;
 class download_thread;
+class vscreen_widget;
 
 /** Represents the UI end of a download process.  This object
  *  completely handles its own memory management -- you don't have to
@@ -72,7 +75,7 @@
   /** Used to keep the download status widget alive until the download
    *  completes.
    */
-  vs_widget_ref download_status;
+  ref_ptr<vscreen_widget> download_status;
 
   void done(download_thread *, pkgAcquire::RunResult res);
 public: