We now always build with MAIN_MENU_USE_UIMANAGER, so remove all code using

the old ways except the proto_help.c file, which is kept for now in case someone
is willing to reimplement the help menus using non-deprecated methods.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39137 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 33 deletions

diff --git a/gtk/tap_param_dlg.c b/gtk/tap_param_dlg.c
index 64ee90dc55..03c7801f5d 100644
--- a/gtk/tap_param_dlg.c
+++ b/gtk/tap_param_dlg.c
@@ -66,41 +66,15 @@ static tap_param_dlg_list_item *start_dlg_list=NULL;
 static tap_param_dlg_list_item *end_dlg_list=NULL;
 static tap_param_dlg_list_item *current_dlg = NULL;
 
-#ifdef MAIN_MENU_USE_UIMANAGER
-#else
-static void tap_param_dlg_cb(GtkWidget *w, gpointer data);
-#endif
 /*
  * Register a stat that has a parameter dialog.
  * We register it both as a command-line stat and a menu item stat.
  */
 void
-register_dfilter_stat(tap_param_dlg *info,
-
-#ifdef MAIN_MENU_USE_UIMANAGER
-    const char *name _U_,
-    register_stat_group_t group _U_
-#else
-    const char *name,
-    register_stat_group_t group
-#endif
-    )
+register_dfilter_stat(tap_param_dlg *info, const char *name _U_,
+    register_stat_group_t group _U_ )
 {
-#ifdef MAIN_MENU_USE_UIMANAGER
-    register_stat_cmd_arg(info->init_string, info->tap_init_cb, NULL);
-#else
-    char *full_name;
-
     register_stat_cmd_arg(info->init_string, info->tap_init_cb, NULL);
-    /*
-     * This menu item will pop up a dialog box, so append "..."
-     * to it.
-     */
-    full_name = g_strdup_printf("%s...", name);
-    register_stat_menu_item(full_name, group, tap_param_dlg_cb, NULL,
-                            NULL, info);
-    /* tap_menu_item_add() uses the name later on. Leave it allocated. */
-#endif
 }
 
 void tap_param_dlg_update (void)
@@ -157,13 +131,8 @@ tap_param_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data)
     g_string_free(params, TRUE);
 }
 
-#ifdef MAIN_MENU_USE_UIMANAGER
 void
 tap_param_dlg_cb(GtkAction *action _U_, gpointer data)
-#else
-static void
-tap_param_dlg_cb(GtkWidget *w _U_, gpointer data)
-#endif
 {
     const char *filter;
     char *title;