From d479d04a68be54d17e5f37cb588b22c3fd2929c5 Mon Sep 17 00:00:00 2001
From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Wed, 3 Oct 2007 02:18:10 +0000
Subject: [PATCH] Stop the "Gtk-WARNING **: node type doesn't match 2
 (menu-main is type 7)" messages.  The main menu is a popup, not a menubar.

git-svn-id: http://svn.voria.com/code@823 1f10aa63-cdf2-0310-b900-c93c546f37ac
---
 synfig-studio/trunk/src/gtkmm/dock_layers.cpp           | 4 ++--
 synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp    | 2 +-
 synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp | 2 +-
 synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
index 03d9d59..e506fc0 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
@@ -111,7 +111,7 @@ Dock_Layers::Dock_Layers():
 		Glib::RefPtr<Gtk::ActionGroup> action_group_categories(Gtk::ActionGroup::create("layer-category"));
 		synfig::String layer_ui_info;
 
-		layer_ui_info+="<ui><menubar action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
+		layer_ui_info+="<ui><popup action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
 
 		std::map<synfig::String,synfig::String>::iterator iter;
 		for(iter=category_map.begin();iter!=category_map.end();++iter)
@@ -120,7 +120,7 @@ Dock_Layers::Dock_Layers():
 			action_group_categories->add(Gtk::Action::create(iter->first.c_str(),iter->first.c_str()));
 		}
 
-		layer_ui_info+="</menu></menu></menubar></ui>";
+		layer_ui_info+="</menu></menu></popup></ui>";
 
 		App::ui_manager()->insert_action_group(action_group_categories);
 		App::ui_manager()->insert_action_group(action_group_new_layers);
diff --git a/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp
index 5e27ef6..b80fc09 100644
--- a/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp
@@ -230,7 +230,7 @@ GroupActionManager::refresh()
 
 	if(true)
 	{
-		ui_info="<ui><menubar action='menu-main'><menu action='menu-group'>"+ui_info+"</menu></menubar></ui>";
+		ui_info="<ui><popup action='menu-main'><menu action='menu-group'>"+ui_info+"</menu></popup></ui>";
 		popup_id_=get_ui_manager()->add_ui_from_string(ui_info);
 	}
 	else
diff --git a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
index 7e320f6..070d7f9 100644
--- a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp
@@ -238,7 +238,7 @@ KeyframeActionManager::refresh()
 			action->set_sensitive(false);
 	}
 
-	ui_info="<ui><menubar action='menu-main'><menu action='menu-keyframe'>"+ui_info+"</menu></menubar></ui>";
+	ui_info="<ui><popup action='menu-main'><menu action='menu-keyframe'>"+ui_info+"</menu></popup></ui>";
 	popup_id_=get_ui_manager()->add_ui_from_string(ui_info);
 #ifdef ONE_ACTION_GROUP
 #else
diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
index 80b91b9..59ea0dd 100644
--- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp
@@ -301,7 +301,7 @@ LayerActionManager::refresh()
 		}
 	}
 
-	ui_info="<ui><menubar action='menu-main'><menu action='menu-layer'>"+ui_info+"<separator/><menuitem action='cut' /><menuitem action='copy' /><menuitem action='paste' /><separator/></menu></menubar></ui>";
+	ui_info="<ui><popup action='menu-main'><menu action='menu-layer'>"+ui_info+"<separator/><menuitem action='cut' /><menuitem action='copy' /><menuitem action='paste' /><separator/></menu></popup></ui>";
 	popup_id_=get_ui_manager()->add_ui_from_string(ui_info);
 #ifdef ONE_ACTION_GROUP
 #else
-- 
2.7.4