diff -r db50e4164311 -r 84f76a3876d7 mapeditor.cpp
--- a/mapeditor.cpp	Wed Jun 14 14:43:18 2006 +0000
+++ b/mapeditor.cpp	Tue Jul 04 12:10:56 2006 +0000
@@ -130,8 +130,8 @@
 extern QMenu* branchContextMenu;
 extern QMenu* branchAddContextMenu;
 extern QMenu* branchRemoveContextMenu;
-extern QMenu* branchLinksContextMenu;
-extern QMenu* branchLinksContextMenuDup;
+extern QMenu* branchLinksContextMenuEdit;
+extern QMenu* branchLinksContextMenuFollow;
 extern QMenu* floatimageContextMenu;
 extern QMenu* saveImageFormatMenu;
 extern QMenu* canvasContextMenu;
@@ -2517,7 +2517,6 @@
 
 void MapEditor::updateActions()
 {
-return;  //FIXME testing
 	QAction *a;
 	if (getLinkColorHint()==HeadingColor) 
 		actionFormatLinkColorHint->setOn(true);
@@ -2560,17 +2559,14 @@
 			// Take care of links
 			if (bo->countXLinks()==0)
 			{
-				branchLinksContextMenu->clear();
-				branchLinksContextMenu->insertItem ("No xLink available");
-				branchLinksContextMenuDup->clear();
-				branchLinksContextMenuDup->insertItem ("No xLink available");
-				
+				branchLinksContextMenuEdit->clear();
+				branchLinksContextMenuFollow->clear();
 			} else
 			{
 				BranchObj *bot;
 				QString s;
-				branchLinksContextMenu->clear();
-				branchLinksContextMenuDup->clear();
+				branchLinksContextMenuEdit->clear();
+				branchLinksContextMenuFollow->clear();
 				for (int i=0; i<=bo->countXLinks();i++)
 				{
 					bot=bo->XLinkTargetAt(i);
@@ -2579,8 +2575,8 @@
 						s=bot->getHeading();
 						if (s.length()>25)
 							s=s.left(25)+"...";
-						branchLinksContextMenu->insertItem (s);
-						branchLinksContextMenuDup->insertItem (s);
+						branchLinksContextMenuFollow->addAction (s);
+						branchLinksContextMenuEdit->addAction (s);
 					}	
 				}
 			}
@@ -3070,6 +3066,7 @@
 
 void MapEditor::editXLink(int i)
 {
+	qDebug ("ko.");
 	if (selection && 
 		(typeid(*selection) == typeid(BranchObj)) || 
 		(typeid(*selection) == typeid(MapCenterObj))  )