dia r4252 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sun Feb  1 18:00:38 2009
New Revision: 4252
URL: http://svn.gnome.org/viewvc/dia?rev=4252&view=rev

Log:
2009-02-01  Hans Breuer  <hans breuer org>

	* app/menus.c : stop complains during plug-in callback menu 
	registration for the integrated UI case



Modified:
   trunk/ChangeLog
   trunk/app/menus.c

Modified: trunk/app/menus.c
==============================================================================
--- trunk/app/menus.c	(original)
+++ trunk/app/menus.c	Sun Feb  1 18:00:38 2009
@@ -514,7 +514,8 @@
       ensure_menu_path (ui_manager, actions, subpath, FALSE);
 
       action = gtk_action_new (action_name, sep + 1, NULL, NULL);
-      gtk_action_group_add_action (actions, action);
+      if (!gtk_action_group_get_action (actions, action_name))
+        gtk_action_group_add_action (actions, action);
       g_object_unref (G_OBJECT (action));
 
       gtk_ui_manager_add_ui (ui_manager, id, subpath, 
@@ -976,6 +977,11 @@
     error = NULL;
   }
   g_free (uifile);
+  if (!gtk_ui_manager_add_ui_from_string (integrated_ui_manager, ui_info, -1, &error)) {
+    g_warning ("built-in menus failed: %s", error->message);
+    g_error_free (error);
+    error = NULL;
+  }
 
   add_plugin_actions (integrated_ui_manager, NULL);