From f8c976489400ad3d77bd0d254fc6e7e227e203dd Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 15 Apr 2001 03:37:16 +0000 Subject: There's no "enable name resolution in captures" preference in Ethereal, and never was - there's only an Ethereal-wide "enable name resolution" preference. Name it just "name_resolve". Replace all tests of "g_resolving_actif" with tests of "prefs.name_resolv", and replace all code that sets "g_resolving_actif" with code that sets "prefs.name_resolv", so that the setting of "prefs.name_resolv" actually affects whether names are resolved or not. svn path=/trunk/; revision=3300 --- gtk/capture_dlg.c | 6 +++--- gtk/display_opts.c | 6 +++--- gtk/file_dlg.c | 7 ++++--- gtk/main.c | 10 +++++----- gtk/menu.c | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) (limited to 'gtk') diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 0cdc223de3..a004f27174 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1,7 +1,7 @@ /* capture_dlg.c * Routines for packet capture windows * - * $Id: capture_dlg.c,v 1.40 2001/04/13 14:59:30 jfoster Exp $ + * $Id: capture_dlg.c,v 1.41 2001/04/15 03:37:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -278,7 +278,7 @@ capture_prep_cb(GtkWidget *w, gpointer d) resolv_cb = dlg_check_button_new_with_label_with_mnemonic( "Enable _name resolution", accel_group); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), prefs.capture_name_resolve); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), prefs.name_resolve); gtk_container_add(GTK_CONTAINER(main_vb), resolv_cb); gtk_widget_show(resolv_cb); @@ -502,7 +502,7 @@ capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w) { prefs.capture_auto_scroll = GTK_TOGGLE_BUTTON (auto_scroll_cb)->active; - prefs.capture_name_resolve = GTK_TOGGLE_BUTTON (resolv_cb)->active; + prefs.name_resolve = GTK_TOGGLE_BUTTON (resolv_cb)->active; gtk_widget_destroy(GTK_WIDGET(parent_w)); diff --git a/gtk/display_opts.c b/gtk/display_opts.c index 8a293543fd..d052f23b4e 100644 --- a/gtk/display_opts.c +++ b/gtk/display_opts.c @@ -1,7 +1,7 @@ /* display_opts.c * Routines for packet display windows * - * $Id: display_opts.c,v 1.19 2001/04/13 14:59:30 jfoster Exp $ + * $Id: display_opts.c,v 1.20 2001/04/15 03:37:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -179,7 +179,7 @@ display_opt_cb(GtkWidget *w, gpointer d) { button = dlg_check_button_new_with_label_with_mnemonic( "Enable _name resolution", accel_group); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), prefs.capture_name_resolve); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), prefs.name_resolve); gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_NAME_RESOLUTION_KEY, button); gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0); @@ -269,7 +269,7 @@ get_display_options(GtkWidget *parent_w) button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_DISPLAY_NAME_RESOLUTION_KEY); - prefs.capture_name_resolve = (GTK_TOGGLE_BUTTON (button)->active); + prefs.name_resolve = (GTK_TOGGLE_BUTTON (button)->active); } diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index e6c2732dc4..ef82046999 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.37 2001/04/09 22:35:23 gram Exp $ + * $Id: file_dlg.c,v 1.38 2001/04/15 03:37:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -39,6 +39,7 @@ #include "globals.h" #include "gtkglobals.h" +#include "prefs.h" #include "resolv.h" #include "keys.h" #include "filter_prefs.h" @@ -97,7 +98,7 @@ file_open_cmd_cb(GtkWidget *w, gpointer data) resolv_cb = dlg_check_button_new_with_label_with_mnemonic( "Enable name resolution", NULL); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), g_resolving_actif); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), prefs.name_resolve); gtk_box_pack_end(GTK_BOX(GTK_FILE_SELECTION(file_open_w)->main_vbox), resolv_cb, FALSE, FALSE, 5); gtk_widget_show(resolv_cb); @@ -190,7 +191,7 @@ file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs) { /* Set the global resolving variable */ resolv_cb = gtk_object_get_data(GTK_OBJECT(w), E_FILE_RESOLVE_KEY); - g_resolving_actif = GTK_TOGGLE_BUTTON (resolv_cb)->active; + prefs.name_resolve = GTK_TOGGLE_BUTTON (resolv_cb)->active; /* We've crossed the Rubicon; get rid of the file selection box. */ gtk_widget_hide(GTK_WIDGET (fs)); diff --git a/gtk/main.c b/gtk/main.c index a18182654a..b00d45cc93 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.192 2001/04/13 14:59:30 jfoster Exp $ + * $Id: main.c,v 1.193 2001/04/15 03:37:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -520,11 +520,11 @@ void expand_all_cb(GtkWidget *widget, gpointer data) { void resolve_name_cb(GtkWidget *widget, gpointer data) { if (cfile.protocol_tree) { - int tmp = prefs.capture_name_resolve; - prefs.capture_name_resolve = 1; + int tmp = prefs.name_resolve; + prefs.name_resolve = 1; gtk_clist_clear ( GTK_CLIST(tree_view) ); proto_tree_draw(cfile.protocol_tree, tree_view); - prefs.capture_name_resolve = tmp; + prefs.name_resolve = tmp; } } @@ -988,7 +988,7 @@ main(int argc, char *argv[]) prefs->gui_font_name = g_strdup(optarg); break; case 'n': /* No name resolution */ - prefs->capture_name_resolve = 0; + prefs->name_resolve = 0; break; case 'o': /* Override preference from command line */ switch (prefs_set_pref(optarg)) { diff --git a/gtk/menu.c b/gtk/menu.c index b0a695f521..183a84496c 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.51 2001/04/13 14:59:30 jfoster Exp $ + * $Id: menu.c,v 1.52 2001/04/15 03:37:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -400,7 +400,7 @@ set_menus_for_selected_packet(gboolean have_selected_packet) set_menu_sensitivity("/Tools/Decode As...", have_selected_packet && decode_as_ok()); set_menu_sensitivity("/Resolve Name", - have_selected_packet && !prefs.capture_name_resolve); + have_selected_packet && !prefs.name_resolve); } /* Enable or disable menu items based on whether a tree row is selected. */ -- cgit v1.2.3