Introduce experimental new feature: GTK2 tree view based packet list

[metze/wireshark/wip.git] / gtk / drag_and_drop.c

diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 8353232c45a2e7a8b58e476bc7a0a727922b5681..f5bd0db1eeb5cfd46d5fee36cabc9dd50168f754 100644 (file)
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -48,7 +48,7 @@
 #include "gtk/capture_file_dlg.h"
 #include "gtk/drag_and_drop.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #ifdef HAVE_LIBPCAP
 #include "gtk/capture_globals.h"
 #endif
@@ -194,7 +194,9 @@ dnd_merge_files(int in_file_count, char **in_filenames)
        return;
     }
 
+#ifndef NEW_PACKET_LIST
     gtk_widget_grab_focus(packet_list);
+#endif
 }
 
 /* open/merge the dnd file */