[niepce] Really merge menus properly.

[Hubert Figuière <hub src gnome org>]

commit 1a64a51108408dd77c74527a95ddb0c184685ba3
Author: Hubert Figuiere <hub figuiere net>
Date:   Mon Jul 13 21:40:02 2009 -0400

    Really merge menus properly.

 ChangeLog                      |    2 ++
 src/niepce/ui/moduleshell.cpp  |    8 ++++----
 src/niepce/ui/niepcewindow.cpp |    3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9463765..c8dcd3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-07-13  Hubert Figuiere  <hub figuiere net>
 
+	* Really merge menus properly.
+
 	* Fix a crash when switching to the Darkroom without any image.
 
 	* Add UiController. Properly merge and unmerge UI and split
diff --git a/src/niepce/ui/moduleshell.cpp b/src/niepce/ui/moduleshell.cpp
index 22c8093..8585a25 100644
--- a/src/niepce/ui/moduleshell.cpp
+++ b/src/niepce/ui/moduleshell.cpp
@@ -135,8 +135,8 @@ Gtk::Widget * ModuleShell::buildWidget(const Glib::RefPtr<Gtk::UIManager> & mana
 
     Glib::ustring ui_info =
         "<ui>"
-        "  <menubar>"
-        "    <placeholder action='MenuImage'>"
+        "  <menubar name='MenuBar'>"
+        "    <menu action='MenuImage'>"
         "      <menuitem action='PrevImage'/>"
         "      <menuitem action='NextImage'/>"
         "      <separator/>"
@@ -160,11 +160,11 @@ Gtk::Widget * ModuleShell::buildWidget(const Glib::RefPtr<Gtk::UIManager> & mana
         "      </menu>"
         "      <separator/>"
         "      <menuitem action='DeleteImage'/>"
-        "    </placeholder>"
+        "    </menu>"
         "  </menubar>"
         "</ui>";
     m_ui_merge_id = manager->add_ui_from_string(ui_info);
-
+    DBG_ASSERT(m_ui_merge_id, "merge failed");
 
     m_gridview = GridViewModule::Ptr(
         new GridViewModule(m_getclient, 
diff --git a/src/niepce/ui/niepcewindow.cpp b/src/niepce/ui/niepcewindow.cpp
index 0af9838..565a48e 100644
--- a/src/niepce/ui/niepcewindow.cpp
+++ b/src/niepce/ui/niepcewindow.cpp
@@ -183,8 +183,7 @@ void NiepceWindow::init_ui(const Glib::RefPtr<Gtk::UIManager> & manager)
         "      <separator/>"
         "      <menuitem action='Preferences'/>"
         "    </menu>"
-        "    <menu action='MenuImage'>"
-        "    </menu>"
+        "    <menu action='MenuImage' />"
         "    <menu action='MenuTools'>"
         "      <menuitem action='EditLabels'/>"
         "      <separator/>"