( 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
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);