diff -r 25a77484ec72 -r db0ec4bcf416 mainwindow.cpp
--- a/mainwindow.cpp	Tue Apr 07 16:15:53 2009 +0000
+++ b/mainwindow.cpp	Mon Apr 20 10:42:05 2009 +0000
@@ -3465,27 +3465,19 @@
 	if (m) m->updateNoteFlag();
 }
 
-/*
-void Main::updateNoteInEditor (VymModel *model, const NoteObj &note)
-{
-	if (model&& model==currentModel() )
-	{
-		textEditor->setNote (note);
-	}
-}
-*/
-
 void Main::updateNoteEditor(QModelIndex index )
 {
+	TreeItem *ti=((VymModel*)sender())->getItem(index);
+	/*
 	cout << "Main::updateNoteEditor model="<<sender();
-	TreeItem *ti=((VymModel*)sender())->getItem(index);
-	cout << "  item="<<ti->getHeading().toStdString()<<" ("<<ti<<")"<<endl;
+	cout << "  item="<<ti->headingStd()<<" ("<<ti<<")"<<endl;
+	*/
 	textEditor->setNote (ti->getNoteObj() );
 }
 
 void Main::changeSelection (VymModel *model, const QItemSelection &newsel, const QItemSelection &oldsel)
 {
-	//branchPropertyWindow->setModel (model ); //FIXME-1 this used to be called from BranchObj::select()
+	//branchPropertyWindow->setModel (model ); //FIXME-2 this used to be called from BranchObj::select()
 
 	if (model && model==currentModel() )
 	{
@@ -3507,9 +3499,7 @@
 			} else
 				textEditor->setNote(NoteObj() );
 		} else
-		{
 			textEditor->setInactive();
-		}
 
 		// Show URL and link in statusbar	// FIXME-2
 		/*
@@ -3524,7 +3514,6 @@
 		// Update Toolbar // FIXME-1, was so far in BranchObj
 		//updateFlagsToolbar();
 
-		// Update actions
 		updateActions();
 	}
 }