Try to fix previous commit.

- menu.h commited by mistake
- new_packet_list.c missing

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

diff --git a/gtk/menus.h b/gtk/menus.h
index 8d89a4bf58e4006073906a7a7639d66171289707..306b3262cdedca4d0e811a34344282b1184cdbc9 100644 (file)
--- a/gtk/menus.h
+++ b/gtk/menus.h
@@ -30,7 +30,6 @@ extern "C" {
 #endif /* __cplusplus */
 
 /*#define MAIN_MENU_USE_UIMANAGER 1 */
-#define MAIN_MENU_USE_UIMANAGER 1
 
        /* Add a new recent capture filename to the "Recent Files" submenu
    (duplicates will be ignored) */

diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index 9ad11cbac84cb7686280ece3fc6f1a69986985af..b8594a1e9afa595e646b465ef9936257b201819c 100644 (file)
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -1216,8 +1216,13 @@ new_packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_)
                gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0);
 
        cf_select_packet(&cfile, row);
-       gtk_widget_grab_focus(packetlist->view);
-
+       /* If searching the tree, set the focus there; otherwise, focus on the packet list */
+       if (cfile.search_in_progress && (cfile.decode_data || cfile.decode_data)) { 
+               gtk_widget_grab_focus(tree_view_gbl);
+       } else {
+               gtk_widget_grab_focus(packetlist->view);
+       }
+       
        /* Add newly selected frame to packet history (breadcrumbs) */
        packet_history_add(row);
 }