diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-08-18 14:40:51 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-08-18 14:40:51 +0000 |
| commit | 3208870317c3fd0ca491d77914440eacaccc03bc (patch) | |
| tree | cf9360e00e088554770f8cfab38ae4dc4c336246 /gtk/menus.c | |
| parent | 43cbf13ad42b89d07d93fd972d287c629ab271b0 (diff) | |
| download | wireshark-3208870317c3fd0ca491d77914440eacaccc03bc.tar.gz | |
Make copy summary work for new_packet_list.
XXX The enum in .h file does not seem to work???
svn path=/trunk/; revision=29467
Diffstat (limited to 'gtk/menus.c')
| -rw-r--r-- | gtk/menus.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index e4095917b7..77f29bb543 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -88,7 +88,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/main.h" #include "gtk/menus.h" -#include "gtk/main_packet_list.h" #include "gtk/main_toolbar.h" #include "gtk/main_welcome.h" #include "gtk/uat_gui.h" @@ -96,6 +95,8 @@ #ifdef NEW_PACKET_LIST #include "gtk/new_packet_list.h" +#else +#include "gtk/main_packet_list.h" #endif #ifdef HAVE_IGE_MAC_INTEGRATION @@ -938,7 +939,11 @@ static GtkItemFactoryEntry packet_list_menu_items[] = {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, {"/Copy", NULL, NULL, 0, "<Branch>", NULL,}, -#ifndef NEW_PACKET_LIST +#ifdef NEW_PACKET_LIST + {"/Copy/Summary (Text)", NULL, GTK_MENU_FUNC(new_packet_list_copy_summary_cb), CS_TEXT, NULL, NULL,}, + {"/Copy/Summary (CSV)", NULL, GTK_MENU_FUNC(new_packet_list_copy_summary_cb), CS_CSV, NULL, NULL,}, + {"/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, +#else {"/Copy/Summary (Text)", NULL, GTK_MENU_FUNC(packet_list_copy_summary_cb), CS_TEXT, NULL, NULL,}, {"/Copy/Summary (CSV)", NULL, GTK_MENU_FUNC(packet_list_copy_summary_cb), CS_CSV, NULL, NULL,}, {"/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, |