diff -r edb78a44240b -r 9ff332964015 mainwindow.cpp
--- a/mainwindow.cpp	Tue Mar 31 15:36:10 2009 +0000
+++ b/mainwindow.cpp	Wed Apr 01 15:06:57 2009 +0000
@@ -8,6 +8,7 @@
 
 #include "aboutdialog.h"
 #include "branchpropwindow.h"
+#include "branchitem.h"
 #include "exportoofiledialog.h"
 #include "exports.h"
 #include "file.h"
@@ -2888,7 +2889,7 @@
     stats+=QString ("%1 notes\n").arg (n,6);
     stats+=QString ("%1 images\n").arg (f,6);
 */
-    stats+=QString ("%1 branches\n").arg (m->countBranches(),6);
+    stats+=QString ("%1 branches\n").arg (m->branchCount(),6);
 	dia.setStats (stats);
 
 	// Finally show dialog
@@ -3608,8 +3609,10 @@
 		if ( (typeid(*selection) == typeid(BranchObj)) || 
 			(typeid(*selection) == typeid(MapCenterObj))  )
 		{
+			BranchItem *bi=(BranchItem*)(selection->getTreeItem() );
 			BranchObj *bo=(BranchObj*)selection;
-			// Take care of links
+			// Take care of links  // FIXME-1
+			/*
 			if (bo->countXLinks()==0)
 			{
 				branchXLinksContextMenuEdit->clear();
@@ -3633,11 +3636,12 @@
 					}	
 				}
 			}
+			*/
 
 			standardFlagsDefault->setEnabled (true);
 
 			actionToggleScroll->setEnabled (true);
-			if ( bo->isScrolled() )
+			if ( bi->isScrolled() )
 				actionToggleScroll->setOn(true);
 			else	
 				actionToggleScroll->setOn(false);