Hello,
the attached patch fixes most of the remaining errors when compiling with
GTK_DISABLE_DEPRECATED. As I really don't have an idea whether that's the
way to go I decided to post it here instead of committing.
Btw. GtkItemFactory seems to be the core of most but no all remaining errors.
Ciao
Joerg
--
Joerg Mayer <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
Index: menus.c
===================================================================
--- menus.c (revision 38005)
+++ menus.c (working copy)
@@ -4102,7 +4102,7 @@
register_stat_menu_item(
const char *name _U_,
register_stat_group_t group _U_,
- GtkItemFactoryCallback callback _U_,
+ gpointer callback _U_,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data) _U_,
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data) _U_,
gpointer callback_data _U_)
Index: gui_stat_menu.h
===================================================================
--- gui_stat_menu.h (revision 38005)
+++ gui_stat_menu.h (working copy)
@@ -60,14 +60,26 @@
* FALSE if not.
*
* @param callback_data data for callback function
- */
-extern void register_stat_menu_item(
- const char *name,
+ */
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+register_stat_menu_item(
+ const char *name _U_,
+ register_stat_group_t group _U_,
+ gpointer callback _U_,
+ gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data) _U_,
+ gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data) _U_,
+ gpointer callback_data _U_);
+#else
+void
+register_stat_menu_item(
+ const char *name,
register_stat_group_t group,
GtkItemFactoryCallback callback,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
- gpointer callback_data);
+ gpointer callback_data)
+#endif
/**
* Same as register_stat_menu_item() but with optional stock item.
@@ -179,7 +191,7 @@
gpointer callback_data);
#else
extern void register_stat_menu_item_stock(
- const char *name,
+ const char *name,
register_stat_group_t group,
const gchar *stock_id,
GtkItemFactoryCallback callback,
