diff options
author | Michael Mann <mmann78@netscape.net> | 2013-03-15 01:31:53 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-03-15 01:31:53 +0000 |
commit | 3a48e7e1e25f93425570b52bcfb00aeeb0f5b342 (patch) | |
tree | 4fe050a0ce4a7eca41148c115ee2a3fec46835c6 /ui/gtk/airpcap_dlg.c | |
parent | fc6e505dacdc12792b5f2175f007715bfe3ce471 (diff) |
Bugfix Decryption Key Management dialog, bug 8446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446)
Needed to convert use of old IEEE802.11 preference strings to UAT. Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.
svn path=/trunk/; revision=48308
Diffstat (limited to 'ui/gtk/airpcap_dlg.c')
-rw-r--r-- | ui/gtk/airpcap_dlg.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index f2a34011db..8934fa7f78 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -35,13 +35,11 @@ #include <epan/filesystem.h> #include <epan/emem.h> #include <epan/prefs.h> -#include <epan/prefs-int.h> #include <epan/frequency-utils.h> #include <epan/crypt/wep-wpadefs.h> #include <pcap.h> -#include "ui/preference_utils.h" #include "ui/simple_dialog.h" #include "ui/gtk/main.h" @@ -68,36 +66,6 @@ typedef struct{ }airpcap_key_ls_selected_info_t; /* - * This function is used to write the preferences to the preferences file. - * It has the same behaviour as prefs_main_write() in prefs_dlg.c - */ -static void -write_prefs_to_file(void) -{ - int err; - char *pf_dir_path; - char *pf_path; - - /* Create the directory that holds personal configuration files, if - necessary. */ - if (create_persconffile_dir(&pf_dir_path) == -1) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "Can't create directory\n\"%s\"\nfor preferences file: %s.", pf_dir_path, - g_strerror(errno)); - g_free(pf_dir_path); - } else { - /* Write the preferencs out. */ - err = write_prefs(&pf_path); - if (err != 0) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - "Can't open preferences file\n\"%s\": %s.", pf_path, - g_strerror(err)); - g_free(pf_path); - } - } -} - -/* * Callback for the select row event in the key list widget */ static void @@ -1958,9 +1926,6 @@ on_key_management_ok_bt_clicked(GtkWidget *button, gpointer data) /* Apply the current decryption preferences */ on_key_management_apply_bt_clicked(button, data); - /* Save the preferences to preferences file!!! */ - write_prefs_to_file(); - gtk_widget_destroy(key_management_w); } @@ -2383,9 +2348,6 @@ on_merge_bt_clicked (GtkWidget* button _U_, gpointer user_data) /* Set up this new list as default for Wireshark and Adapters... */ airpcap_save_decryption_keys(merged_list,airpcap_if_list); - /* Write the preferences to the preferences file */ - write_prefs_to_file(); - free_key_list(wireshark_keys); free_key_list(driver_keys); @@ -2425,9 +2387,6 @@ on_keep_bt_clicked (GtkWidget *button _U_, gpointer user_data) /* Set up this new list as default for Wireshark and Adapters... */ airpcap_save_decryption_keys(merged_keys,airpcap_if_list); - /* Write the preferences to the preferences file (here is not needed, by the way)*/ - write_prefs_to_file(); - /* Free the memory */ free_key_list(wireshark_keys); @@ -2491,9 +2450,6 @@ on_import_bt_clicked (GtkWidget* button _U_, gpointer user_data) /* Set up this new list as default for Wireshark and Adapters... */ airpcap_save_decryption_keys(merged_list,airpcap_if_list); - /* Write the preferences to the preferences file */ - write_prefs_to_file(); - free_key_list(wireshark_keys); free_key_list(driver_keys); |