2008-07-25 [colin] 3.5.0cvs33

	* src/gtk/menu.h
		Add a macro to remove menu items
		Make the gui_manager variable useless

diff --git a/ChangeLog b/ChangeLog
index 58a757c1f29f5f125c8eb90bee6cbcdd46f45703..1ca84edb8250a75d70a7ba7a922ce4a7bdafeee5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-25 [colin]     3.5.0cvs33
+
+       * src/gtk/menu.h
+               Add a macro to remove menu items
+               Make the gui_manager variable useless
+
 2008-07-24 [colin]     3.5.0cvs32
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 631b7fd471ba64e0d589328f3b5dff30c31a0799..ddebe07a93e8b7d3f2f4c67b6e1958ac4b31fc89 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3444,3 +3444,4 @@
 ( cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.5.0cvs30.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/plugins/pgpcore/sgpgme.c;  ) > 3.5.0cvs31.patchset
 ( cvs diff -u -r 1.274.2.255 -r 1.274.2.256 src/mainwindow.c;  cvs diff -u -r 1.83.2.135 -r 1.83.2.136 src/mimeview.c;  cvs diff -u -r 1.395.2.374 -r 1.395.2.375 src/summaryview.c;  cvs diff -u -r 1.68.2.47 -r 1.68.2.48 src/summaryview.h;  ) > 3.5.0cvs32.patchset
+( cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/menu.h;  ) > 3.5.0cvs33.patchset

diff --git a/configure.ac b/configure.ac
index b2251f68b81a332ee45a109843bfd71288dfc759..f2a76fac3c2b9f0f2868e38991a8ad34bc4688c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index 8da32e6cad5f3caa9bfa5c2ee17fa291f465f6f6..512895e9f042c171b2185c64b51098181f2e463f 100644 (file)
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -46,11 +46,23 @@
                                  GINT_TO_POINTER(data));        \
 }
 
-#define MENUITEM_ADDUI(path, name, action, type)       \
-       gtk_ui_manager_add_ui(gui_manager,      \
-                       gtk_ui_manager_new_merge_id(gui_manager),       \
+#define MENUITEM_ADDUI(path, name, action, type)                \
+       gtk_ui_manager_add_ui(gtkut_ui_manager(),                \
+                       gtk_ui_manager_new_merge_id(gui_manager),\
                        path, name, action, type, FALSE);
 
+#define MENUITEM_ADDUI_ID(path, name, action, type,id)          \
+       id = gtk_ui_manager_new_merge_id(gtkut_ui_manager());    \
+       gtk_ui_manager_add_ui(gtkut_ui_manager(),                \
+                       id,                                      \
+                       path, name, action, type, FALSE);
+
+#define MENUITEM_REMUI(action_group,name,id) {                 \
+       GtkAction *action = gtk_action_group_get_action(action_group, name); \
+       if (action) gtk_action_group_remove_action(action_group, action);       \
+       if (id) gtk_ui_manager_remove_ui(gtkut_ui_manager(), id);       \
+}
+
 #define menu_set_insensitive_all(menu_shell) \
        menu_set_sensitive_all(menu_shell, FALSE);