diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-10-22 07:07:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-10-22 07:07:08 +0000 |
| commit | c0ad4beb9c2782baef7b7bcde0fc6b6e7a93b839 (patch) | |
| tree | fd43ea59786cc611cc3b3f0e1e421f628fc13562 | |
| parent | bd23f6f1a833873a580b2c1944695abe14fd0894 (diff) | |
Change some code that affects g_resolv_flags to set a flag if the check
box for the flag is active and clear it if it's inactive, rather than
clearing all but RESOLV_CONCURRENT and then setting flags if the check
box is active - or, in one case, not clearing any flags due to a typo
and then setting them, so they never get cleared. This matches what's
done with theresolution flags in some other places.
svn path=/trunk/; revision=12375
| -rw-r--r-- | gtk/capture_dlg.c | 7 | ||||
| -rw-r--r-- | gtk/file_dlg.c | 17 |
2 files changed, 19 insertions, 5 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 4d067edab7..8023e71cc9 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1371,13 +1371,18 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { capture_opts.show_info = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hide_info_cb)); - g_resolv_flags |= g_resolv_flags & RESOLV_CONCURRENT; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb))) g_resolv_flags |= RESOLV_MAC; + else + g_resolv_flags &= ~RESOLV_MAC; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb))) g_resolv_flags |= RESOLV_NETWORK; + else + g_resolv_flags &= ~RESOLV_NETWORK; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t_resolv_cb))) g_resolv_flags |= RESOLV_TRANSPORT; + else + g_resolv_flags &= ~RESOLV_TRANSPORT; capture_opts.has_ring_num_files = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)); diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 819c3719ce..131ade221b 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -692,13 +692,22 @@ file_open_ok_cb(GtkWidget *w, gpointer fs) { cfile.rfcode = rfcode; /* Set the global resolving variable */ - g_resolv_flags = prefs.name_resolve & RESOLV_CONCURRENT; + g_resolv_flags = prefs.name_resolve; m_resolv_cb = OBJECT_GET_DATA(w, E_FILE_M_RESOLVE_KEY); - g_resolv_flags |= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (m_resolv_cb)) ? RESOLV_MAC : RESOLV_NONE; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (m_resolv_cb))) + g_resolv_flags |= RESOLV_MAC; + else + g_resolv_flags &= ~RESOLV_MAC; n_resolv_cb = OBJECT_GET_DATA(w, E_FILE_N_RESOLVE_KEY); - g_resolv_flags |= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (n_resolv_cb)) ? RESOLV_NETWORK : RESOLV_NONE; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (n_resolv_cb))) + g_resolv_flags |= RESOLV_NETWORK; + else + g_resolv_flags &= ~RESOLV_NETWORK; t_resolv_cb = OBJECT_GET_DATA(w, E_FILE_T_RESOLVE_KEY); - g_resolv_flags |= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (t_resolv_cb)) ? RESOLV_TRANSPORT : RESOLV_NONE; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (t_resolv_cb))) + g_resolv_flags |= RESOLV_TRANSPORT; + else + g_resolv_flags &= ~RESOLV_TRANSPORT; /* We've crossed the Rubicon; get rid of the file selection box. */ window_destroy(GTK_WIDGET (fs)); |