From 40baaf4dbe6b792fb3f1c877b82446237f309c4b Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 9 May 2011 19:29:40 +0000 Subject: [PATCH] We probably shouldn't call pcap-ng "experimental" any more. svn path=/trunk/; revision=37033 --- gtk/capture_dlg.c | 9 ++++----- gtk/prefs_capture.c | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index e81e26ae01..6bc99569d7 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -2056,14 +2056,13 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) set_if_capabilities(FALSE); /* Pcap-NG row */ - pcap_ng_cb = gtk_check_button_new_with_mnemonic("Capture packets in pcap-ng format (experimental)"); + pcap_ng_cb = gtk_check_button_new_with_mnemonic("Capture packets in pcap-ng format"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pcap_ng_cb), global_capture_opts.use_pcapng); #if GTK_CHECK_VERSION(2,12,0) - gtk_widget_set_tooltip_text(pcap_ng_cb, "Capture packets in the next-generation capture file format. " - "This is still experimental."); + gtk_widget_set_tooltip_text(pcap_ng_cb, "Capture packets in the next-generation capture file format."); #else - gtk_tooltips_set_tip(tooltips, pcap_ng_cb, "Capture packets in the next-generation capture file format. " - "This is still experimental.", NULL); + gtk_tooltips_set_tip(tooltips, pcap_ng_cb, "Capture packets in the next-generation capture file format.", + NULL); #endif gtk_container_add(GTK_CONTAINER(left_vb), pcap_ng_cb); diff --git a/gtk/prefs_capture.c b/gtk/prefs_capture.c index 8455445cf4..753d63ad86 100644 --- a/gtk/prefs_capture.c +++ b/gtk/prefs_capture.c @@ -180,8 +180,7 @@ capture_prefs_show(void) /* Pcap-NG format */ pcap_ng_cb = create_preference_check_button(main_tb, row++, "Capture packets in pcap-ng format:", - "Capture packets in the next-generation capture file format. " - "This is still experimental.", + "Capture packets in the next-generation capture file format.", prefs.capture_pcap_ng); g_object_set_data(G_OBJECT(main_vb), PCAP_NG_KEY, pcap_ng_cb);