diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-11-10 23:02:42 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-11-10 23:02:42 +0000 |
commit | 6b1284fa7c5bbf4df75cfbd8a2b93a244a038d89 (patch) | |
tree | c2cb5f4c3857a7ecc160f2219261f1e77ada2b38 /gtk | |
parent | ec8806bc8ec5631037d38e0fa627f005b3e56247 (diff) |
Get rid of the last remnants of the "check the syntax of capture
filters" preference; now that we always build with threads, we do the
syntax checking in a separate thread, so it doesn't hang the UI, and we
no longer have UI to change it but we were still trying to fetch the
value of the non-existent checkbox for it and getting a warning printed.
(We still check for it when reading, so that we don't print warnings if
it's present.)
svn path=/trunk/; revision=39788
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/capture_dlg.c | 6 | ||||
-rw-r--r-- | gtk/prefs_capture.c | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 1a14417793..3febfba565 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -345,9 +345,6 @@ check_capture_filter_syntax(void *data _U_) { static gboolean update_capture_filter_te(gpointer data _U_) { - if (!prefs.capture_syntax_check_filter) - return TRUE; - g_mutex_lock(cfc_data_mtx); if (cfc_data.filter_text && cfc_data.filter_te) { @@ -405,9 +402,6 @@ capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_) gchar *filter_text; gpointer dlt_ptr; - if (!prefs.capture_syntax_check_filter) - return; - linktype_combo_box = (GtkWidget *) g_object_get_data(G_OBJECT(opt_edit_w), E_CAP_LT_CBX_KEY); if (! ws_combo_box_get_active_pointer(GTK_COMBO_BOX(linktype_combo_box), &dlt_ptr)) { diff --git a/gtk/prefs_capture.c b/gtk/prefs_capture.c index 8ea8aa6e3c..c82d0414b0 100644 --- a/gtk/prefs_capture.c +++ b/gtk/prefs_capture.c @@ -55,7 +55,6 @@ #define CAPTURE_REAL_TIME_KEY "capture_real_time" #define AUTO_SCROLL_KEY "auto_scroll" #define SHOW_INFO_KEY "show_info" -#define SYNTAX_CHECK_FILTER_KEY "syntax_check_filter" #define CAPTURE_TABLE_ROWS 6 @@ -215,7 +214,7 @@ capture_prefs_show(void) void capture_prefs_fetch(GtkWidget *w) { - GtkWidget *if_cbxe, *promisc_cb, *pcap_ng_cb, *sync_cb, *auto_scroll_cb, *show_info_cb, *syntax_check_filter_cb; + GtkWidget *if_cbxe, *promisc_cb, *pcap_ng_cb, *sync_cb, *auto_scroll_cb, *show_info_cb; gchar *if_text; if_cbxe = (GtkWidget *)g_object_get_data(G_OBJECT(w), DEVICE_KEY); @@ -224,7 +223,6 @@ capture_prefs_fetch(GtkWidget *w) sync_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), CAPTURE_REAL_TIME_KEY); auto_scroll_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), AUTO_SCROLL_KEY); show_info_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SHOW_INFO_KEY); - syntax_check_filter_cb = (GtkWidget *)g_object_get_data(G_OBJECT(w), SYNTAX_CHECK_FILTER_KEY); if (prefs.capture_device != NULL) { g_free(prefs.capture_device); @@ -251,7 +249,6 @@ capture_prefs_fetch(GtkWidget *w) prefs.capture_auto_scroll = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_scroll_cb)); prefs.capture_show_info = !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(show_info_cb))); - prefs.capture_syntax_check_filter = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(syntax_check_filter_cb)); } void |