glom r1557 - in branches/glom-1-6: . glom

[murrayc svn gnome org]

Author: murrayc
Date: Fri Apr 11 15:46:02 2008
New Revision: 1557
URL: http://svn.gnome.org/viewvc/glom?rev=1557&view=rev

Log:
2008-04-11  Murray Cumming  <murrayc murrayc com>

* glom/application.cc fill_menu_tables(), fill_menu_reports():
Remove the ActionGroups before recreating them to avoid warnings, and 
presumably to avoid the changes from being ignored. Maybe GTK+ svn 
trunk has become less tolerant.

Modified:
   branches/glom-1-6/ChangeLog
   branches/glom-1-6/glom/application.cc

Modified: branches/glom-1-6/glom/application.cc
==============================================================================
--- branches/glom-1-6/glom/application.cc	(original)
+++ branches/glom-1-6/glom/application.cc	Fri Apr 11 15:46:02 2008
@@ -1629,6 +1629,12 @@
   if(m_menu_tables_ui_merge_id)
     m_refUIManager->remove_ui(m_menu_tables_ui_merge_id);
 
+  if(m_refNavTablesActionGroup)
+  {
+    m_refUIManager->remove_action_group(m_refNavTablesActionGroup);
+    m_refNavTablesActionGroup.clear();
+  }
+
   m_refNavTablesActionGroup = Gtk::ActionGroup::create("NavTablesActions");
 
   Glib::ustring ui_description =
@@ -1712,6 +1718,12 @@
   if(m_menu_reports_ui_merge_id)
     m_refUIManager->remove_ui(m_menu_reports_ui_merge_id);
 
+  if(m_refNavReportsActionGroup)
+  {
+    m_refUIManager->remove_action_group(m_refNavReportsActionGroup);
+    m_refNavReportsActionGroup.clear();
+  }
+
   m_refNavReportsActionGroup = Gtk::ActionGroup::create("NavReportsActions");
 
   Glib::ustring ui_description =