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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 19:01:47 2005
New Revision: 3571

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Don't try to pass NULLs as std::string values.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 19:01:47 2005
@@ -2,6 +2,11 @@
 
 	* src/ui.cc:
 
+	  Instead of trying to pass a NULL string to pkg_tree::pkg_tree,
+	  just don't pass the third argument.  Fixes a SIGABRT.
+
+	* src/ui.cc:
+
 	  Implement the wstring variant of show_message.
 
 	* src/main.cc:

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 Jul  2 19:01:47 2005
@@ -578,7 +578,7 @@
 	grp=new pkg_grouppolicy_filter_factory(pkg_missing_filter,new pkg_grouppolicy_task_factory(new pkg_grouppolicy_status_factory(new pkg_grouppolicy_section_factory(pkg_grouppolicy_section_factory::split_subdir,true,new pkg_grouppolicy_section_factory(pkg_grouppolicy_section_factory::split_topdir,false,new pkg_grouppolicy_end_factory())))));
     }
 
-  pkg_tree *tree=new pkg_tree(grpstr.c_str(), grp, NULL);
+  pkg_tree *tree=new pkg_tree(grpstr.c_str(), grp);
 
   add_main_widget(make_default_view(tree,
 				    &tree->selected_signal,
@@ -606,7 +606,7 @@
   grpstr="filter(missing),hier";
   grp=parse_grouppolicy(grpstr);
 
-  pkg_tree *tree=new pkg_tree(grpstr.c_str(), grp, NULL);
+  pkg_tree *tree=new pkg_tree(grpstr.c_str(), grp);
   tree->set_limit(transcode("!~v"));
   //tree->set_hierarchical(false);
 
@@ -843,7 +843,7 @@
       if(aptcfg->Exists(PACKAGE "::UI::Preview-Limit"))
 	active_preview_tree=new pkg_tree(grpstr.c_str(), grp, transcode(aptcfg->Find(PACKAGE "::UI::Preview-Limit").c_str()));
       else
-	active_preview_tree=new pkg_tree(grpstr.c_str(), grp, NULL);
+	active_preview_tree=new pkg_tree(grpstr.c_str(), grp);
 
       active_preview=make_default_view(active_preview_tree,
 				       &active_preview_tree->selected_signal,