[Debtags-commits] [svn] r969 - in debtags-edit/trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Mon Jul  4 17:00:31 2005
New Revision: 969

Modified:
   debtags-edit/trunk/README
   debtags-edit/trunk/configure.ac
   debtags-edit/trunk/debian/changelog
   debtags-edit/trunk/debian/control
   debtags-edit/trunk/src/DebtagsDocument.cc
   debtags-edit/trunk/src/DebtagsEditor.cc
   debtags-edit/trunk/src/TagSelector.cc
Log:
Depends on the new libdebtags1 - ready for 1.0.2 release

Modified: debtags-edit/trunk/README
==============================================================================
--- debtags-edit/trunk/README	(original)
+++ debtags-edit/trunk/README	Mon Jul  4 17:00:31 2005
@@ -1,4 +1,4 @@
-README for debtags-edit 1.0.1
+README for debtags-edit 1.0.2
 =============================
 
 Functionality
@@ -21,6 +21,8 @@
 computation.  I'll need to significantly improve their performance before
 reincluding them again.
 
+Disabled intensive computations by default.
+
 
 Compiling from the subversion repository
 ----------------------------------------
@@ -83,6 +85,7 @@
 
 These are the TODO-list items completed so far::
 
+ + Disabled intensive computations by default
 
 (older completed items are archived in the DONE file)
 

Modified: debtags-edit/trunk/configure.ac
==============================================================================
--- debtags-edit/trunk/configure.ac	(original)
+++ debtags-edit/trunk/configure.ac	Mon Jul  4 17:00:31 2005
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(debtags-edit, 1.0.1, [enrico@debian.org])
+AC_INIT(debtags-edit, 1.0.2, [enrico@debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

Modified: debtags-edit/trunk/debian/changelog
==============================================================================
--- debtags-edit/trunk/debian/changelog	(original)
+++ debtags-edit/trunk/debian/changelog	Mon Jul  4 17:00:31 2005
@@ -1,3 +1,10 @@
+debtags-edit (1.0.2) unstable; urgency=low
+
+  * Disabled slow algorithms by default
+  * Depends on new libdebtags1 to get rid of some nasty segfault
+
+ -- Enrico Zini <enrico@debian.org>  Mon,  4 Jul 2005 18:59:24 +0200
+
 debtags-edit (1.0.1) experimental; urgency=low
 
   * Disabled specials generation as a quick-fix to frequent crashes.  I will

Modified: debtags-edit/trunk/debian/control
==============================================================================
--- debtags-edit/trunk/debian/control	(original)
+++ debtags-edit/trunk/debian/control	Mon Jul  4 17:00:31 2005
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, libdebtags1-dev (>= 1.0.3), libdebtags1-dev (<< 1.1), libgtkmm-2.4-dev
+Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, libdebtags1-dev (>= 1.0.5), libdebtags1-dev (<< 1.1), libgtkmm-2.4-dev
 Standards-Version: 3.6.1.0
 
 Package: debtags-edit

Modified: debtags-edit/trunk/src/DebtagsDocument.cc
==============================================================================
--- debtags-edit/trunk/src/DebtagsDocument.cc	(original)
+++ debtags-edit/trunk/src/DebtagsDocument.cc	Mon Jul  4 17:00:31 2005
@@ -39,7 +39,7 @@
 using namespace std;
 using namespace Debtags;
 
-DebtagsDocument::DebtagsDocument() throw () : DebtagsSimple<string>(true), _undoTail(0), specialsGen(*this), computeIntensive(true), specials(100), hasSpecials(NO)
+DebtagsDocument::DebtagsDocument() throw () : DebtagsSimple<string>(true), _undoTail(0), specialsGen(*this), computeIntensive(false), specials(100), hasSpecials(NO)
 {
 	regenerateSpecials();
 }

Modified: debtags-edit/trunk/src/DebtagsEditor.cc
==============================================================================
--- debtags-edit/trunk/src/DebtagsEditor.cc	(original)
+++ debtags-edit/trunk/src/DebtagsEditor.cc	Mon Jul  4 17:00:31 2005
@@ -166,7 +166,7 @@
 	editMenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Facet dialog",
 				sigc::mem_fun(fpanel, &FilterPanel<DOC>::do_facets_dialog)));
 
-	optionsMenu.items().push_back(Gtk::Menu_Helpers::CheckMenuElem("_Compute intensive data",
+	optionsMenu.items().push_back(Gtk::Menu_Helpers::CheckMenuElem("_Disable slow experimental algorithms",
 				sigc::mem_fun(*this, &DebtagsEditor::on_compute_intensive_data)));
 	computeIntensiveMenuItem = dynamic_cast<Gtk::CheckMenuItem*>(&(optionsMenu.items().back()));
 	computeIntensiveMenuItem->set_active(doc.getComputeIntensive());
@@ -422,7 +422,7 @@
 template<class DOC>
 void DebtagsEditor<DOC>::on_compute_intensive_data()
 {
-	doc.setComputeIntensive(computeIntensiveMenuItem->get_active());
+	doc.setComputeIntensive(!computeIntensiveMenuItem->get_active());
 }
 
 /*

Modified: debtags-edit/trunk/src/TagSelector.cc
==============================================================================
--- debtags-edit/trunk/src/TagSelector.cc	(original)
+++ debtags-edit/trunk/src/TagSelector.cc	Mon Jul  4 17:00:31 2005
@@ -53,11 +53,11 @@
 	{
 		TagMenu<DebtagsDocument>* addMenu = manage(new TagMenu<DebtagsDocument>());
 		//addMenu->populateAvailable(doc, _selected);
-		if (0)
+		if (doc.getComputeIntensive())
 		{
-			addMenu->populateAvailable(doc, _selected, doc.subCollection);
-		} else {
 			addMenu->populateAvailableSmart(doc, _selected, doc.subCollection);
+		} else {
+			addMenu->populateAvailable(doc, _selected, doc.subCollection);
 		}
 		addMenu->signal_selected().connect(
 					sigc::mem_fun(*this, &TagSelector::on_add_to_selection));