add 12 new toolbar/menu icons

add two toolbar toggle buttons
add icons to various menu items

create new Statistics telephony group and put telephony and alike protocols in it

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

24 files changed, 278 insertions, 55 deletions

diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 7c2337e524..cfa2b49c88 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -478,8 +478,8 @@ register_tap_listener_gtkansi_a_stat(void)
 	exit(1);
     }
 
-    register_tap_menu_item("ANSI/A-Interface BSMAP", REGISTER_TAP_GROUP_NONE, 
+    register_tap_menu_item("ANSI/A-Interface BSMAP", REGISTER_TAP_GROUP_TELEPHONY, 
         ansi_a_stat_gtk_bsmap_cb, NULL, NULL ,NULL);
-    register_tap_menu_item("ANSI/A-Interface DTAP", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("ANSI/A-Interface DTAP", REGISTER_TAP_GROUP_TELEPHONY,
         ansi_a_stat_gtk_dtap_cb, NULL, NULL ,NULL);
 }
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 9260822724..4f686d34a9 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -442,6 +442,6 @@ register_tap_listener_gtkansi_map_stat(void)
 	exit(1);
     }
 
-    register_tap_menu_item("ANSI/MAP Operation", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("ANSI/MAP Operation", REGISTER_TAP_GROUP_TELEPHONY,
         ansi_map_stat_gtk_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 869e5650ac..86406034a4 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -204,6 +204,18 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name)
 #define ETHEREAL_STOCK_EDIT                     "Edit..."
 #define ETHEREAL_STOCK_ADD_EXPRESSION           "Add Expression..."
 #define ETHEREAL_STOCK_DONT_SAVE                "Continue without Saving"
+#define ETHEREAL_STOCK_ABOUT                    "About"
+#define ETHEREAL_STOCK_COLORIZE                 "Colorize"
+#define ETHEREAL_STOCK_AUTOSCROLL               "Auto Scroll in Live Capture"
+#define ETHEREAL_STOCK_RESIZE_COLUMNS           "Resize Columns"
+#define ETHEREAL_STOCK_TIME                     "Time"
+#define ETHEREAL_STOCK_INTERNET                 "Internet"
+#define ETHEREAL_STOCK_WEB_SUPPORT              "Web Support"
+#define ETHEREAL_STOCK_WIKI                     "Wiki"
+#define ETHEREAL_STOCK_CONVERSATIONS            "Conversations"
+#define ETHEREAL_STOCK_ENDPOINTS                "Endpoints"
+#define ETHEREAL_STOCK_GRAPHS                   "Graphs"
+#define ETHEREAL_STOCK_TELEPHONY                "Telephony"
 
 /** Create a stock button. Will create a "normal" button for GTK1.
  *
@@ -308,6 +320,18 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
 #define ETHEREAL_STOCK_LABEL_EDIT                     "_Edit..."
 #define ETHEREAL_STOCK_LABEL_ADD_EXPRESSION           "_Expression..." /* plus sign coming from icon */
 #define ETHEREAL_STOCK_LABEL_DONT_SAVE                "Continue _without Saving"
+#define ETHEREAL_STOCK_LABEL_ABOUT                    "_About"
+#define ETHEREAL_STOCK_LABEL_COLORIZE                 "_Colorize"
+#define ETHEREAL_STOCK_LABEL_AUTOSCROLL               "_Auto Scroll in Live Capture"
+#define ETHEREAL_STOCK_LABEL_RESIZE_COLUMNS           "Resize Columns"
+#define ETHEREAL_STOCK_LABEL_TIME                     "Time"
+#define ETHEREAL_STOCK_LABEL_INTERNET                 "Internet"
+#define ETHEREAL_STOCK_LABEL_WEB_SUPPORT              "Web Support"
+#define ETHEREAL_STOCK_LABEL_WIKI                     "Wiki"
+#define ETHEREAL_STOCK_LABEL_CONVERSATIONS            "Conversations"
+#define ETHEREAL_STOCK_LABEL_ENDPOINTS                "Endpoints"
+#define ETHEREAL_STOCK_LABEL_GRAPHS                   "Graphs"
+#define ETHEREAL_STOCK_LABEL_TELEPHONY                "Telephony"
 
 #ifdef HAVE_LIBPCAP
 #define ETHEREAL_STOCK_CAPTURE_INTERFACES       "Ethereal_Stock_CaptureInterfaces"
@@ -328,6 +352,18 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
 #define ETHEREAL_STOCK_EDIT                     "Ethereal_Stock_Edit"
 #define ETHEREAL_STOCK_ADD_EXPRESSION           "Ethereal_Stock_Edit_Add_Expression"
 #define ETHEREAL_STOCK_DONT_SAVE                "Ethereal_Stock_Continue_without_Saving"
+#define ETHEREAL_STOCK_ABOUT                    "Ethereal_Stock_About"
+#define ETHEREAL_STOCK_COLORIZE                 "Ethereal_Stock_Colorize"
+#define ETHEREAL_STOCK_AUTOSCROLL               "Ethereal_Stock_Autoscroll"
+#define ETHEREAL_STOCK_RESIZE_COLUMNS           "Ethereal_Stock_Resize_Columns"
+#define ETHEREAL_STOCK_TIME                     "Ethereal_Stock_Time"
+#define ETHEREAL_STOCK_INTERNET                 "Ethereal_Stock_Internet"
+#define ETHEREAL_STOCK_WEB_SUPPORT              "Ethereal_Stock_Web_Support"
+#define ETHEREAL_STOCK_WIKI                     "Ethereal_Stock_Wiki"
+#define ETHEREAL_STOCK_CONVERSATIONS            "Ethereal_Stock_Conversations"
+#define ETHEREAL_STOCK_ENDPOINTS                "Ethereal_Stock_Endpoints"
+#define ETHEREAL_STOCK_GRAPHS                   "Ethereal_Stock_Graphs"
+#define ETHEREAL_STOCK_TELEPHONY                "Ethereal_Stock_Telephony"
 
 #define BUTTON_NEW_FROM_STOCK(stock_id) \
 gtk_button_new_from_stock(stock_id);
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index a6c0e6fc6c..5c8a0e5e7f 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -638,27 +638,27 @@ register_tap_listener_gtkgsm_a_stat(void)
 	exit(1);
     }
 
-    register_tap_menu_item("GSM/A-Interface BSSMAP", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface BSSMAP", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_bssmap_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/Mobility Management", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/Mobility Management", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_mm_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/Radio Resource Management", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/Radio Resource Management", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_rr_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/Call Control", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/Call Control", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_cc_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/GPRS Mobility Management", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/GPRS Mobility Management", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_gmm_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/Short Message Service", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/Short Message Service", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_sms_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/GPRS Session Management", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/GPRS Session Management", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_sm_cb, NULL, NULL, NULL);
 
-    register_tap_menu_item("GSM/A-Interface DTAP/Supplementary Services", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/A-Interface DTAP/Supplementary Services", REGISTER_TAP_GROUP_TELEPHONY,
 	gsm_a_stat_gtk_dtap_ss_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index c4f7d03f2b..e563f4fc79 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -476,6 +476,6 @@ register_tap_listener_gtkgsm_map_stat(void)
 	exit(1);
     }
 
-    register_tap_menu_item("GSM/MAP Operation",  REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/MAP Operation",  REGISTER_TAP_GROUP_TELEPHONY,
         gsm_map_stat_gtk_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index d68e25e925..0ccd1ee5be 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -290,6 +290,6 @@ gsm_map_stat_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_listener_gtkgsm_map_summary(void)
 {
-    register_tap_menu_item("GSM/MAP Summary",  REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("GSM/MAP Summary",  REGISTER_TAP_GROUP_TELEPHONY,
         gsm_map_stat_gtk_sum_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 2b4bf3df24..24894402b9 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -564,6 +564,6 @@ register_tap_listener_gtk_h225counter(void)
 {
 	register_tap_listener_cmd_arg("h225,counter", gtk_h225counter_init);
 
-	register_tap_menu_item("H.225...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("H.225...", REGISTER_TAP_GROUP_TELEPHONY,
 	    gtk_tap_dfilter_dlg_cb, NULL, NULL, &(h225_counter_dlg));
 }
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index 795f4a64c0..5c898a97a2 100644
--- a/gtk/isup_stat.c
+++ b/gtk/isup_stat.c
@@ -416,6 +416,6 @@ register_tap_listener_gtkisup_stat(void)
 	exit(1);
     }
 
-    register_tap_menu_item("ISUP Message Types", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("ISUP Message Types", REGISTER_TAP_GROUP_TELEPHONY,
         isup_stat_gtk_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/menu.c b/gtk/menu.c
index 75d10276d3..b217f6f6ba 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -217,7 +217,8 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Edit/Find Pre_vious", "<control>B", find_previous_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Edit/_Time Reference", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+    ITEM_FACTORY_STOCK_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, 
+                        REFTIME_TOGGLE, ETHEREAL_STOCK_TIME),
     ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/_Mark Packet (toggle)", "<control>M", mark_frame_cb,
@@ -237,7 +238,6 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/View/Packet _List", NULL, packet_list_show_cb, 0, "<CheckItem>", NULL),
     ITEM_FACTORY_ENTRY("/View/Packet _Details", NULL, tree_view_show_cb, 0, "<CheckItem>", NULL),
     ITEM_FACTORY_ENTRY("/View/Packet _Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Colorize Packet List", NULL, colorize_cb, 0, "<CheckItem>", NULL),
     ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/View/_Time Display Format", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_ENTRY("/View/Time Display Format/Time of Day", NULL, timestamp_absolute_cb, 
@@ -254,6 +254,7 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _MAC Layer", NULL, name_resolution_mac_cb, 0, "<CheckItem>", NULL),
     ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Network Layer", NULL, name_resolution_network_cb, 0, "<CheckItem>", NULL),
     ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Transport Layer", NULL, name_resolution_transport_cb, 0, "<CheckItem>", NULL),
+    ITEM_FACTORY_ENTRY("/View/Colorize Packet List", NULL, colorize_cb, 0, "<CheckItem>", NULL),
 #ifdef HAVE_LIBPCAP
     ITEM_FACTORY_ENTRY("/View/Auto Scroll in Li_ve Capture", NULL, auto_scroll_live_cb, 0, "<CheckItem>", NULL),
 #endif
@@ -264,9 +265,9 @@ static GtkItemFactoryEntry menu_items[] =
                              0, GTK_STOCK_ZOOM_OUT),
     ITEM_FACTORY_STOCK_ENTRY("/View/_Normal Size", "<control>equal", view_zoom_100_cb,
                              0, GTK_STOCK_ZOOM_100),
+    ITEM_FACTORY_STOCK_ENTRY("/View/Resize All Columns", NULL, packet_list_resize_columns_cb,
+                       0, ETHEREAL_STOCK_RESIZE_COLUMNS),
     ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/View/Resize Columns", NULL, packet_list_resize_columns_cb,
-                       0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/View/Collapse _All", NULL, collapse_all_cb,
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/View/_Expand All", NULL, expand_all_cb,
@@ -348,13 +349,13 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
                        follow_stream_cb, 0, NULL, NULL),    
     ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, NULL, NULL),
+    ITEM_FACTORY_STOCK_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, GTK_STOCK_PROPERTIES),
     ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
                        proto_hier_stats_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Statistics/Conversations", NULL,
-                       init_conversation_notebook_cb, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Statistics/Endpoints", NULL,
-                       init_hostlist_notebook_cb, 0, NULL, NULL),
+    ITEM_FACTORY_STOCK_ENTRY("/Statistics/Conversations", NULL,
+                       init_conversation_notebook_cb, 0, ETHEREAL_STOCK_CONVERSATIONS),
+    ITEM_FACTORY_STOCK_ENTRY("/Statistics/Endpoints", NULL,
+                       init_hostlist_notebook_cb, 0, ETHEREAL_STOCK_ENDPOINTS),
     ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", topic_menu_cb, HELP_CONTENT, GTK_STOCK_HELP),
     ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
@@ -372,15 +373,15 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/Help/Manual Pages/Text2pcap", NULL, topic_menu_cb, LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Ethereal Online", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Home Page", NULL, topic_menu_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
-    ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Wiki", NULL, topic_menu_cb, ONLINEPAGE_WIKI, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Help/Ethereal Online/User's Guide", NULL, topic_menu_cb, ONLINEPAGE_USERGUIDE, NULL, NULL),
+    ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Wiki", NULL, topic_menu_cb, ONLINEPAGE_WIKI, ETHEREAL_STOCK_WIKI),
+    ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/User's Guide", NULL, topic_menu_cb, ONLINEPAGE_USERGUIDE, ETHEREAL_STOCK_WEB_SUPPORT),
     ITEM_FACTORY_ENTRY("/Help/Ethereal Online/FAQ's", NULL, topic_menu_cb, ONLINEPAGE_FAQ, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Downloads", NULL, topic_menu_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, topic_menu_cb, ONLINEPAGE_SAMPLE_FILES, NULL, NULL),
 #endif
     ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-    ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb,
-                       0, NULL, NULL)
+    ITEM_FACTORY_STOCK_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb,
+                       0, ETHEREAL_STOCK_ABOUT)
 };
 
 
@@ -392,7 +393,7 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
 {
     ITEM_FACTORY_ENTRY("/Mark Packet (toggle)", NULL, mark_frame_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+    ITEM_FACTORY_STOCK_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, ETHEREAL_STOCK_TIME),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
 
@@ -479,9 +480,9 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
 
     ITEM_FACTORY_STOCK_ENTRY("/Wiki Protocol Page", NULL, selected_ptree_info_cb,
-                       0, GTK_STOCK_HOME),
+                       0, ETHEREAL_STOCK_WIKI),
     ITEM_FACTORY_STOCK_ENTRY("/Filter Field Reference", NULL, selected_ptree_ref_cb,
-                       0, GTK_STOCK_HOME),
+                       0, ETHEREAL_STOCK_INTERNET),
     ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb,
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
@@ -668,6 +669,7 @@ register_tap_menu_item(
     case(REGISTER_TAP_GROUP_CONVERSATION_LIST): toolspath = "/Statistics/_Conversation List/"; break;
     case(REGISTER_TAP_GROUP_ENDPOINT_LIST): toolspath = "/Statistics/_Endpoint List/"; break;
     case(REGISTER_TAP_GROUP_RESPONSE_TIME): toolspath = "/Statistics/Service _Response Time/"; break;
+    case(REGISTER_TAP_GROUP_TELEPHONY): toolspath = "/Statistics/"; break;
     case(REGISTER_TAP_GROUP_NONE): toolspath = "/Statistics/"; break;
     default:
         g_assert(0);
@@ -770,6 +772,32 @@ guint merge_tap_menus_layered(GList *node, gint group) {
             entry = g_malloc0(sizeof (GtkItemFactoryEntry));
             entry->path = node_data->name;
             entry->callback = node_data->callback;
+#if GTK_MAJOR_VERSION >= 2
+            switch(group) {
+            case(REGISTER_TAP_GROUP_NONE):
+                break;
+            case(REGISTER_TAP_GROUP_GENERIC):
+                break;
+            case(REGISTER_TAP_GROUP_CONVERSATION_LIST):
+                entry->item_type = "<StockItem>";
+                entry->extra_data = ETHEREAL_STOCK_CONVERSATIONS;
+                break;
+            case(REGISTER_TAP_GROUP_ENDPOINT_LIST):
+                entry->item_type = "<StockItem>";
+                entry->extra_data = ETHEREAL_STOCK_ENDPOINTS;
+                break;
+            case(REGISTER_TAP_GROUP_RESPONSE_TIME):
+                entry->item_type = "<StockItem>";
+                entry->extra_data = ETHEREAL_STOCK_TIME;
+                break;
+            case(REGISTER_TAP_GROUP_TELEPHONY):
+                entry->item_type = "<StockItem>";
+                entry->extra_data = ETHEREAL_STOCK_TELEPHONY;
+                break;
+            default:
+                g_assert_not_reached();
+            }
+#endif
             gtk_item_factory_create_item(main_menu_factory, entry, node_data->callback_data, 2);
             set_menu_sensitivity(main_menu_factory, node_data->name, FALSE); /* no capture file yet */
             added++;
@@ -828,6 +856,9 @@ void merge_all_tap_menus(GList *node) {
     if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_RESPONSE_TIME)) {
         gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
     }
+    if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_TELEPHONY)) {
+        gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
+    }
     if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_NONE)) {
         /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
     }
@@ -1337,21 +1368,63 @@ name_resolution_transport_cb(GtkWidget *w _U_, gpointer d _U_)
 }
 
 #ifdef HAVE_LIBPCAP
+void
+menu_auto_scroll_live_changed(gboolean auto_scroll_live_in) {
+    GtkWidget *menu;
+
+
+    /* tell menu about it */
+    menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Auto Scroll in Live Capture");
+    if( ((gboolean) GTK_CHECK_MENU_ITEM(menu)->active) != auto_scroll_live_in) {
+        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), auto_scroll_live_in);
+    }
+
+    /* tell toolbar about it */
+    toolbar_auto_scroll_live_changed(auto_scroll_live_in);
+
+    /* change auto scroll */
+    if(auto_scroll_live_in != auto_scroll_live) {
+        auto_scroll_live  = auto_scroll_live_in;
+    }
+}
+
 static void 
 auto_scroll_live_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-    auto_scroll_live = GTK_CHECK_MENU_ITEM(w)->active;
+    menu_auto_scroll_live_changed(GTK_CHECK_MENU_ITEM(w)->active);
 }
 #endif
 
+
+void
+menu_colorize_changed(gboolean packet_list_colorize) {
+    GtkWidget *menu;
+
+
+    /* tell menu about it */
+    menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Colorize Packet List");
+    if( ((gboolean) GTK_CHECK_MENU_ITEM(menu)->active) != packet_list_colorize) {
+        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), packet_list_colorize);
+    }
+
+    /* tell toolbar about it */
+    toolbar_colorize_changed(packet_list_colorize);
+
+    /* change colorization */
+    if(packet_list_colorize != recent.packet_list_colorize) {
+        recent.packet_list_colorize = packet_list_colorize;
+        color_filters_enable(packet_list_colorize);
+        cf_colorize_packets(&cfile);
+    }
+}
+
 static void 
-colorize_cb(GtkWidget *w _U_, gpointer d _U_)
+colorize_cb(GtkWidget *w, gpointer d _U_)
 {
-    recent.packet_list_colorize = GTK_CHECK_MENU_ITEM(w)->active;
-    color_filters_enable(recent.packet_list_colorize);
-    cf_colorize_packets(&cfile);
+    menu_colorize_changed(GTK_CHECK_MENU_ITEM(w)->active);
 }
 
+
 /* the recent file read has finished, update the menu corresponding */
 void
 menu_recent_read_finished(void) {
@@ -1422,6 +1495,8 @@ menu_recent_read_finished(void) {
     default:
         g_assert_not_reached();
     }
+
+    menu_colorize_changed(recent.packet_list_colorize);
 }
 
 
@@ -1734,7 +1809,7 @@ set_menus_for_selected_packet(capture_file *cf)
       cf->current_frame != NULL);
   set_menu_sensitivity(main_menu_factory, "/Edit/Unmark All Packets",
       cf->current_frame != NULL);
-  set_menu_sensitivity(main_menu_factory, "/View/Resize Columns",
+  set_menu_sensitivity(main_menu_factory, "/View/Resize All Columns",
       cf->current_frame != NULL);
   set_menu_sensitivity(main_menu_factory, "/View/Collapse All",
       cf->current_frame != NULL);
diff --git a/gtk/menu.h b/gtk/menu.h
index c02acfb568..c07b61b305 100644
--- a/gtk/menu.h
+++ b/gtk/menu.h
@@ -51,6 +51,14 @@ extern void menu_recent_read_finished(void);
 /** One of the name resolution menu items changed. */
 extern void menu_name_resolution_changed(void);
 
+/** The "Colorize Packet List" option changed. */
+extern void menu_colorize_changed(gboolean packet_list_colorize);
+
+#ifdef HAVE_LIBPCAP
+/** The "Auto Scroll Packet List in Live Capture" option changed. */
+extern void menu_auto_scroll_live_changed(gboolean auto_scroll_in);
+#endif
+
 /** Create a new menu.
  *
  * @param accel the created accelerator group
diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index 70dc5ee566..ce6e96b1b4 100644
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.c
@@ -465,6 +465,6 @@ register_tap_listener_gtkmtp3_stat(void)
 	exit(1);
     }
 
-    register_tap_menu_item("MTP3/MSUs",  REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("MTP3/MSUs",  REGISTER_TAP_GROUP_TELEPHONY,
         mtp3_stat_gtk_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index ee15fd4bef..c31b86a872 100644
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.c
@@ -435,6 +435,6 @@ mtp3_sum_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
 void
 register_tap_listener_gtkmtp3_summary(void)
 {
-    register_tap_menu_item("MTP3/MSU Summary",  REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("MTP3/MSU Summary",  REGISTER_TAP_GROUP_TELEPHONY,
         mtp3_sum_gtk_sum_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index a488468e3b..984ca1ed65 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -3651,6 +3651,6 @@ register_tap_listener_rtp_analysis(void)
 {
 	register_tap_listener_cmd_arg("rtp", rtp_analysis_init);
 
-	register_tap_menu_item("RTP/Stream Analysis...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("RTP/Stream Analysis...", REGISTER_TAP_GROUP_TELEPHONY,
 	    rtp_analysis_cb, NULL, NULL, NULL);
 }
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 3b0cdb28c0..dbf17ae61a 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -884,6 +884,6 @@ void rtpstream_launch(GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_rtp_stream_dlg(void)
 {
-	register_tap_menu_item("RTP/Show All Streams...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("RTP/Show All Streams...", REGISTER_TAP_GROUP_TELEPHONY,
 	    rtpstream_launch, NULL, NULL, NULL);
 }
diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 87411bdf5a..8840d28e75 100644
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -877,6 +877,6 @@ void sctp_analyse_start(GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_sctp_analyse(void)
 {
-	register_tap_menu_item("SCTP/Analyse Association", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("SCTP/Analyse Association", REGISTER_TAP_GROUP_TELEPHONY,
 	                       sctp_analyse_start, NULL, NULL, NULL);
 }
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index 94e051d583..68bd56d172 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -346,6 +346,6 @@ register_tap_listener_sctpstat(void)
 {
 	register_tap_listener_cmd_arg("sctp,stat", sctpstat_init);
 
-	register_tap_menu_item("SCTP/Chunk Counter", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("SCTP/Chunk Counter", REGISTER_TAP_GROUP_TELEPHONY,
 	                       gtk_tap_dfilter_dlg_cb, NULL, NULL, &(sctp_stat_dlg));
 }
diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c
index 59eb44b95d..c81a63c5a3 100644
--- a/gtk/sctp_error_dlg.c
+++ b/gtk/sctp_error_dlg.c
@@ -294,6 +294,6 @@ void sctp_error_dlg_show(sctp_assoc_info_t* assoc)
 /*void
 register_tap_listener_sctp_error_dlg(void)
 {
-	register_tap_menu_item("SCTP/Show All Malformed Packets...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("SCTP/Show All Malformed Packets...", REGISTER_TAP_GROUP_TELEPHONY,
 	    sctp_error_start, NULL, NULL, NULL);
 }*/
diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c
index d185f71cb1..c6568c6c8f 100644
--- a/gtk/sctp_stat_dlg.c
+++ b/gtk/sctp_stat_dlg.c
@@ -607,7 +607,7 @@ void sctp_stat_start(GtkWidget *w _U_, gpointer data _U_)
 void
 register_tap_listener_sctp_stat_dlg(void)
 {
-	register_tap_menu_item("SCTP/Show All Associations...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("SCTP/Show All Associations...", REGISTER_TAP_GROUP_TELEPHONY,
 	    sctp_stat_start, NULL, NULL, NULL);
 }
 
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index c0de0c4379..1e1edffb6c 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -664,6 +664,6 @@ register_tap_listener_gtksipstat(void)
 {
     register_tap_listener_cmd_arg("sip,stat", gtk_sipstat_init);
 
-    register_tap_menu_item("SIP", REGISTER_TAP_GROUP_NONE,
+    register_tap_menu_item("SIP", REGISTER_TAP_GROUP_TELEPHONY,
                            gtk_tap_dfilter_dlg_cb, NULL, NULL, &(sip_stat_dlg));
 }
diff --git a/gtk/tap_menu.h b/gtk/tap_menu.h
index 0a4aefd723..d791343eea 100644
--- a/gtk/tap_menu.h
+++ b/gtk/tap_menu.h
@@ -39,7 +39,9 @@ typedef enum {
     REGISTER_TAP_GROUP_GENERIC,
     REGISTER_TAP_GROUP_CONVERSATION_LIST,
     REGISTER_TAP_GROUP_ENDPOINT_LIST,
-    REGISTER_TAP_GROUP_RESPONSE_TIME
+    REGISTER_TAP_GROUP_RESPONSE_TIME,
+    REGISTER_TAP_GROUP_TELEPHONY
+    /* XXX - split into telephony and VoIP? */
 } REGISTER_TAP_GROUP_E;
 
 /**
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index cb6cb2599d..80c16af37d 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -62,6 +62,9 @@
 #include "compat_macros.h"
 #include "recent.h"
 #include "packet_history.h"
+#include "packet_list.h"
+#include "color_filters.h"
+#include "menu.h"
 
 /* Most of the icons used here are coming (or are derived) from GTK2 stock icons.
  * They were converted using "The Gimp" with standard conversion from png to xpm.
@@ -69,8 +72,9 @@
  * "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.6.tar.bz2"
  * in the directory "gtk+-2.0.6\gtk\stock-icons" */
 
-/* The base for the new capture icons was GNOME's Connection-Ethernet.png and it's 
- * 16x16 counterpart, which are released under the GPL (or LGPL?). These icons were 
+/* The base for the new capture icons were GNOME system tools: Connection-Ethernet.png 
+ * see http://cvs.gnome.org/viewcvs/gnome-system-tools/pixmaps/ and it's 16x16 counterpart, 
+ * which are released under the GPL (or LGPL?). These icons were 
  * merged together with some icons of the tremendous ximian icon collection (>1200!)
  * for  OpenOffice? (LGPL'ed), which can be found at:
  * http://www.novell.com/coolsolutions/feature/1637.html
@@ -117,6 +121,18 @@
 #if GTK_MAJOR_VERSION >= 2
 #include "../image/toolbar/stock_properties_24.xpm"
 #endif
+#include "../image/eicon3d16.xpm"
+#include "../image/toolbar/colorize_24.xpm"
+#include "../image/toolbar/autoscroll_24.xpm"
+#include "../image/toolbar/resize_columns_24.xpm"
+#include "../image/toolbar/time_24.xpm"
+#include "../image/toolbar/internet_24.xpm"
+#include "../image/toolbar/web_support_24.xpm"
+#include "../image/toolbar/wiki_24.xpm"
+#include "../image/toolbar/conversations_16.xpm"
+#include "../image/toolbar/endpoints_16.xpm"
+#include "../image/toolbar/graphs_16.xpm"
+#include "../image/toolbar/telephony_16.xpm"
 
 
 /* XXX: add this key to some .h file, as it adds a key to the top level Widget? */
@@ -133,7 +149,7 @@ static GtkWidget *open_button, *save_button, *save_as_button, *close_button, *re
 static GtkWidget *print_button, *find_button, *history_forward_button, *history_back_button;
 static GtkWidget *go_to_button, *go_to_top_button, *go_to_bottom_button;
 static GtkWidget *display_filter_button;
-static GtkWidget *zoom_in_button, *zoom_out_button, *zoom_100_button;
+static GtkWidget *zoom_in_button, *zoom_out_button, *zoom_100_button, *colorize_button, *autoscroll_button, *resize_columns_button;
 static GtkWidget *color_display_button, *prefs_button, *help_button;
 
 #if GTK_MAJOR_VERSION >= 2
@@ -168,7 +184,19 @@ static void ethereal_stock_icons(void) {
         { ETHEREAL_STOCK_IMPORT,                ETHEREAL_STOCK_LABEL_IMPORT,                0, 0, NULL },
         { ETHEREAL_STOCK_EDIT,                  ETHEREAL_STOCK_LABEL_EDIT,                  0, 0, NULL },
         { ETHEREAL_STOCK_ADD_EXPRESSION,        ETHEREAL_STOCK_LABEL_ADD_EXPRESSION,        0, 0, NULL },
-        { ETHEREAL_STOCK_DONT_SAVE,             ETHEREAL_STOCK_LABEL_DONT_SAVE,             0, 0, NULL }
+        { ETHEREAL_STOCK_DONT_SAVE,             ETHEREAL_STOCK_LABEL_DONT_SAVE,             0, 0, NULL },
+        { ETHEREAL_STOCK_ABOUT,                 ETHEREAL_STOCK_LABEL_ABOUT,                 0, 0, NULL },
+        { ETHEREAL_STOCK_COLORIZE,              ETHEREAL_STOCK_LABEL_COLORIZE,              0, 0, NULL },
+        { ETHEREAL_STOCK_AUTOSCROLL,            ETHEREAL_STOCK_LABEL_AUTOSCROLL,            0, 0, NULL },
+        { ETHEREAL_STOCK_RESIZE_COLUMNS,        ETHEREAL_STOCK_LABEL_RESIZE_COLUMNS,        0, 0, NULL },
+        { ETHEREAL_STOCK_TIME,                  ETHEREAL_STOCK_LABEL_TIME,                  0, 0, NULL },
+        { ETHEREAL_STOCK_INTERNET,              ETHEREAL_STOCK_LABEL_INTERNET,              0, 0, NULL },
+        { ETHEREAL_STOCK_WEB_SUPPORT,           ETHEREAL_STOCK_LABEL_WEB_SUPPORT,           0, 0, NULL },
+        { ETHEREAL_STOCK_WIKI,                  ETHEREAL_STOCK_LABEL_WIKI,                  0, 0, NULL },
+        { ETHEREAL_STOCK_CONVERSATIONS,         ETHEREAL_STOCK_LABEL_CONVERSATIONS,         0, 0, NULL },
+        { ETHEREAL_STOCK_ENDPOINTS,             ETHEREAL_STOCK_LABEL_ENDPOINTS,             0, 0, NULL },
+        { ETHEREAL_STOCK_GRAPHS,                ETHEREAL_STOCK_LABEL_GRAPHS,                0, 0, NULL },
+        { ETHEREAL_STOCK_TELEPHONY,             ETHEREAL_STOCK_LABEL_TELEPHONY,             0, 0, NULL }
     };
 
     static const stock_pixmap_t pixmaps[] = {
@@ -190,6 +218,18 @@ static void ethereal_stock_icons(void) {
         { ETHEREAL_STOCK_IMPORT,                stock_save_24_xpm },    /* XXX: needs a better icon */
         { ETHEREAL_STOCK_EDIT,                  stock_properties_24_xpm },
         { ETHEREAL_STOCK_ADD_EXPRESSION,        stock_add_24_xpm },
+        { ETHEREAL_STOCK_ABOUT,                 eicon3d16_xpm },
+        { ETHEREAL_STOCK_COLORIZE,              colorize_24_xpm },
+        { ETHEREAL_STOCK_AUTOSCROLL,            autoscroll_24_xpm },
+        { ETHEREAL_STOCK_RESIZE_COLUMNS,        resize_columns_24_xpm},
+        { ETHEREAL_STOCK_TIME,                  time_24_xpm},
+        { ETHEREAL_STOCK_INTERNET,              internet_24_xpm},
+        { ETHEREAL_STOCK_WEB_SUPPORT,           web_support_24_xpm},
+        { ETHEREAL_STOCK_WIKI,                  wiki_24_xpm},
+        { ETHEREAL_STOCK_CONVERSATIONS,         conversations_16_xpm},
+        { ETHEREAL_STOCK_ENDPOINTS,             endpoints_16_xpm},
+        { ETHEREAL_STOCK_GRAPHS,                graphs_16_xpm},
+        { ETHEREAL_STOCK_TELEPHONY,             telephony_16_xpm},
         { NULL, NULL }
     };
 
@@ -365,6 +405,48 @@ static void toolbar_append_separator(GtkWidget *toolbar) {
 #endif /* GTK_MAJOR_VERSION */
 
 
+#define toolbar_icon(new_icon, window, xpm) { \
+    icon = gdk_pixmap_create_from_xpm_d(window->window, &mask, &window->style->white, xpm); \
+    new_icon = gtk_pixmap_new(icon, mask); \
+    }
+
+
+#define toolbar_toggle_button(new_item, window, toolbar, stock, tooltip, xpm, callback, user_data) {\
+    toolbar_icon(iconw, window, xpm); \
+    new_item = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), \
+        GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, \
+        stock, tooltip, "Private", iconw, GTK_SIGNAL_FUNC(callback), user_data);\
+    }
+
+
+
+static void
+colorize_toggle_cb(GtkWidget *toggle_button, gpointer user_data _U_) {
+    menu_colorize_changed(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle_button)));
+}
+
+void
+toolbar_colorize_changed(gboolean packet_list_colorize) {
+    if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(colorize_button)) != packet_list_colorize) {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(colorize_button), packet_list_colorize);
+    }
+}
+
+
+#ifdef HAVE_LIBPCAP
+static void
+auto_scroll_live_toggle_cb(GtkWidget *autoscroll_button, gpointer user_data _U_) {
+    menu_auto_scroll_live_changed(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(autoscroll_button)));
+}
+
+void
+toolbar_auto_scroll_live_changed(gboolean auto_scroll_live) {
+    if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(autoscroll_button)) != auto_scroll_live) {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(autoscroll_button), auto_scroll_live);
+    }
+}
+#endif
+
 /*
  * Create all toolbars (currently only the main toolbar)
  */
@@ -374,10 +456,10 @@ toolbar_new(void)
     GtkWidget *main_tb;
     GtkWidget *window = top_level;
 #if GTK_MAJOR_VERSION < 2
+#endif /* GTK_MAJOR_VERSION */
     GdkPixmap *icon;
-    GtkWidget *iconw;
     GdkBitmap * mask;
-#endif /* GTK_MAJOR_VERSION */
+    GtkWidget *iconw;
 
     
 #if GTK_MAJOR_VERSION >= 2
@@ -452,12 +534,22 @@ toolbar_new(void)
         GTK_STOCK_GOTO_BOTTOM, "Go to the last packet", stock_bottom_24_xpm, goto_bottom_frame_cb, NULL);
     toolbar_append_separator(main_tb);
 
+    toolbar_toggle_button(colorize_button, window, main_tb, 
+        ETHEREAL_STOCK_CAPTURE_INTERFACES, "Colorize Packet List", colorize_24_xpm, colorize_toggle_cb, NULL);
+#ifdef HAVE_LIBPCAP
+    toolbar_toggle_button(autoscroll_button, window, main_tb, 
+        ETHEREAL_STOCK_AUTOSCROLL, "Auto Scroll Packet List in Live Capture", autoscroll_24_xpm, auto_scroll_live_toggle_cb, NULL);
+#endif
+    toolbar_append_separator(main_tb);
+
     toolbar_item(zoom_in_button, window, main_tb, 
         GTK_STOCK_ZOOM_IN, "Zoom in", stock_zoom_in_24_xpm, view_zoom_in_cb, NULL);
     toolbar_item(zoom_out_button, window, main_tb, 
         GTK_STOCK_ZOOM_OUT, "Zoom out", stock_zoom_out_24_xpm, view_zoom_out_cb, NULL);
     toolbar_item(zoom_100_button, window, main_tb, 
         GTK_STOCK_ZOOM_100, "Zoom 100%", stock_zoom_1_24_xpm, view_zoom_100_cb, NULL);
+    toolbar_item(resize_columns_button, window, main_tb, 
+        ETHEREAL_STOCK_RESIZE_COLUMNS, "Resize All Columns", resize_columns_24_xpm, packet_list_resize_columns_cb, NULL);
     toolbar_append_separator(main_tb);
     
 #ifdef HAVE_LIBPCAP
diff --git a/gtk/toolbar.h b/gtk/toolbar.h
index 5b9bb362cd..5efac3e634 100644
--- a/gtk/toolbar.h
+++ b/gtk/toolbar.h
@@ -39,6 +39,16 @@ GtkWidget *toolbar_new(void);
 /** Redraw the main toolbar. Used, when user changes preferences. */
 void toolbar_redraw_all(void);
 
+/** The "Colorize Packet List" option has changed.
+ */
+void toolbar_colorize_changed(gboolean packet_list_colorize);
+
+#ifdef HAVE_LIBPCAP
+/** The "Auto Scroll in Live Capture" option has changed.
+ */
+void toolbar_auto_scroll_live_changed(gboolean auto_scroll_live);
+#endif
+
 /** We have (or don't have) a capture file now.
  *
  * @param have_capture_file TRUE, if we have a capture file
diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 2e718d2dc3..7be77e30b0 100644
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -767,7 +767,7 @@ void
 register_tap_listener_voip_calls_dlg(void)
 {
 	register_tap_listener_cmd_arg("voip,calls",voip_calls_init_tap);
-	register_tap_menu_item("VoIP Calls...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("VoIP Calls...", REGISTER_TAP_GROUP_TELEPHONY,
 	    voip_calls_launch, NULL, NULL, NULL);
 	    
 }
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 903987bbb7..755a17ec8c 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -427,6 +427,6 @@ register_tap_listener_gtkwspstat(void)
 {
 	register_tap_listener_cmd_arg("wsp,stat", gtk_wspstat_init);
 
-	register_tap_menu_item("WAP-WSP...", REGISTER_TAP_GROUP_NONE,
+	register_tap_menu_item("WAP-WSP...", REGISTER_TAP_GROUP_TELEPHONY,
 	    gtk_tap_dfilter_dlg_cb, NULL, NULL, &(wsp_stat_dlg));
 }