GTK: Remove packet editor

Removes limited experimental feature for deprecated UI.

Change-Id: Ib3ccfae89dd2a674ebbde346a442fa1cf6587f26
Reviewed-on: https://code.wireshark.org/review/24563
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 0 insertions, 36 deletions

diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 2541604a4b..31720adc69 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -171,14 +171,6 @@ new_window_cb_ref(GtkWidget *widget)
     new_packet_window(widget, TRUE, FALSE);
 }
 
-#ifdef WANT_PACKET_EDITOR
-static void
-edit_window_cb(GtkWidget *widget _U_)
-{
-    new_packet_window(widget, FALSE, TRUE);
-}
-#endif
-
 static void
 colorize_conversation_cb(conversation_filter_t* color_filter, int action_num)
 {
@@ -816,9 +808,6 @@ static const char *ui_desc_menubar =
 "        <separator/>\n"
 "        <menuitem name='TimeShift' action='/Edit/TimeShift'/>\n"
 "        <separator/>\n"
-#ifdef WANT_PACKET_EDITOR
-"        <menuitem name='EditPacket' action='/Edit/EditPacket'/>\n"
-#endif
 "        <menuitem name='AddEditPktComment' action='/Edit/AddEditPktComment'/>\n"
 "        <menuitem name='AddEditCaptureComment' action='/Edit/AddEditCaptureComment'/>\n"
 "        <separator/>\n"
@@ -1326,9 +1315,6 @@ static const GtkActionEntry main_menu_bar_entries[] = {
 
    { "/Edit/ConfigurationProfiles", NULL,                   "_Configuration Profiles...",           "<shift><control>A",        NULL,           G_CALLBACK(profile_dialog_cb) },
    { "/Edit/Preferences",           GTK_STOCK_PREFERENCES,  "_Preferences...",                      "<shift><control>P",        NULL,           G_CALLBACK(menus_prefs_cb) },
-#ifdef WANT_PACKET_EDITOR
-   { "/Edit/EditPacket",                NULL,               "_Edit Packet",                          NULL,                      NULL,           G_CALLBACK(edit_window_cb) },
-#endif
    { "/Edit/AddEditPktComment",         WIRESHARK_STOCK_EDIT,   "Packet Comment...",                "<alt><control>C",          NULL,           G_CALLBACK(edit_packet_comment_dlg) },
    { "/Edit/AddEditCaptureComment",     NULL,                   "Capture Comment...",               "<shift><alt><control>C",   NULL,           G_CALLBACK(edit_capture_comment_dlg_launch) },
 
@@ -2122,9 +2108,6 @@ static const char *ui_desc_packet_list_menu_popup =
 "     <menuitem name='IgnorePacket' action='/IgnorePacket'/>\n"
 "     <menuitem name='SetTimeReference' action='/Set Time Reference'/>\n"
 "     <menuitem name='TimeShift' action='/TimeShift'/>\n"
-#ifdef WANT_PACKET_EDITOR
-"     <menuitem name='EditPacket' action='/Edit/EditPacket'/>\n"
-#endif
 "     <menuitem name='AddEditPktComment' action='/Edit/AddEditPktComment'/>\n"
 "     <separator/>\n"
 "     <menuitem name='ManuallyResolveAddress' action='/ManuallyResolveAddress'/>\n"
@@ -2207,9 +2190,6 @@ static const GtkActionEntry packet_list_menu_popup_action_entries[] = {
   { "/Set Time Reference",              WIRESHARK_STOCK_TIME,   "Set Time Reference (toggle)",  NULL,                   NULL,           G_CALLBACK(packet_list_menu_set_ref_time_cb) },
   { "/TimeShift",                       WIRESHARK_STOCK_TIME,   "Time Shift...",                NULL,                   NULL,           G_CALLBACK(time_shift_cb) },
   { "/ManuallyResolveAddress",          NULL,                   "Manually Resolve Address",     NULL,                   NULL,           G_CALLBACK(manual_addr_resolv_dlg) },
-#ifdef WANT_PACKET_EDITOR
-   { "/Edit/EditPacket",                NULL,                   "_Edit Packet",                 NULL,                   NULL,           G_CALLBACK(edit_window_cb) },
-#endif
   { "/Edit/AddEditPktComment",          WIRESHARK_STOCK_EDIT,   "Packet Comment...",            NULL,                   NULL,           G_CALLBACK(edit_packet_comment_dlg) },
 
   { "/Conversation Filter",             NULL, "Conversation Filter",    NULL, NULL, NULL },
@@ -2307,9 +2287,6 @@ static const char *ui_desc_tree_view_menu_popup =
 "        </menu>\n"
 "     </menu>\n"
 "     <menuitem name='ExportSelectedPacketBytes' action='/ExportSelectedPacketBytes'/>\n"
-#ifdef WANT_PACKET_EDITOR
-"     <menuitem name='EditPacket' action='/Edit/EditPacket'/>\n"
-#endif
 "     <separator/>\n"
 "     <menuitem name='WikiProtocolPage' action='/WikiProtocolPage'/>\n"
 "     <menuitem name='FilterFieldReference' action='/FilterFieldReference'/>\n"
@@ -2365,9 +2342,6 @@ static const GtkActionEntry tree_view_menu_popup_action_entries[] = {
   { "/Copy/Bytes/BinaryStream",                     NULL,       "Binary Stream",                        NULL, NULL, G_CALLBACK(packet_list_menu_copy_bytes_bin_strm_cb) },
 
   { "/ExportSelectedPacketBytes",                   NULL,       "Export Selected Packet Bytes...",      NULL, NULL, G_CALLBACK(savehex_cb) },
-#ifdef WANT_PACKET_EDITOR
-  { "/Edit/EditPacket",                NULL,               "_Edit Packet",                         NULL,                       NULL,           G_CALLBACK(edit_window_cb) },
-#endif
   { "/WikiProtocolPage",            WIRESHARK_STOCK_WIKI,       "Wiki Protocol Page",                   NULL, NULL, G_CALLBACK(selected_ptree_info_cb) },
   { "/FilterFieldReference",    WIRESHARK_STOCK_INTERNET,       "Filter Field Reference",               NULL, NULL, G_CALLBACK(selected_ptree_ref_cb) },
   { "/ProtocolHelp",                                NULL,       "Protocol Help",                        NULL, NULL, NULL },
@@ -4550,12 +4524,6 @@ set_menus_for_selected_packet(capture_file *cf)
 
     set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/IgnorePacket",
                          frame_selected);
-#ifdef WANT_PACKET_EDITOR
-    set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/EditPacket",
-                         prefs.gui_packet_editor ? frame_selected : FALSE);
-    set_menu_sensitivity(ui_manager_packet_list_menu, "/PacketListMenuPopup/EditPacket",
-                         prefs.gui_packet_editor ? frame_selected : FALSE);
-#endif /* WANT_PACKET_EDITOR */
     set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/AddEditPktComment",
                          frame_selected && wtap_dump_can_write(cf->linktypes, WTAP_COMMENT_PER_PACKET));
     set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/AddEditCaptureComment",
@@ -5177,10 +5145,6 @@ set_menus_for_selected_tree_row(capture_file *cf)
                              cf->finfo_selected->tree_type != -1);
         set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/CollapseSubtrees",
                              cf->finfo_selected->tree_type != -1);
-#ifdef WANT_PACKET_EDITOR
-        set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/EditPacket",
-                             prefs.gui_packet_editor ? TRUE : FALSE);
-#endif
         set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/WikiProtocolPage",
                              (id == -1) ? FALSE : TRUE);
         set_menu_sensitivity(ui_manager_tree_view_menu, "/TreeViewPopup/FilterFieldReference",