diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-04-09 02:48:03 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-04-09 02:48:03 +0000 |
commit | c2ced4a2aba6bdde3fdad77407cd528e8a11a446 (patch) | |
tree | 76fee7f6f6a7e18bbec88064f1f36de465c1f667 /ui | |
parent | cfd03173b443f9c8644aa7196105f7eb166926a7 (diff) |
Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written to
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702. I think it's now safe
to remove that backwards compatibility.
This eliminates the last argument of get_persconffile_path().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8437
svn path=/trunk/; revision=48797
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gtk/about_dlg.c | 2 | ||||
-rw-r--r-- | ui/gtk/decode_as_dlg.c | 4 | ||||
-rw-r--r-- | ui/gtk/main.c | 2 | ||||
-rw-r--r-- | ui/qt/main.cpp | 2 | ||||
-rw-r--r-- | ui/recent.c | 14 |
5 files changed, 12 insertions, 12 deletions
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 71aa50f116..3a0dbdfdc3 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -420,7 +420,7 @@ about_folders_page_new(void) g_free(path); /* pers conf */ - path = get_persconffile_path("", FALSE, FALSE); + path = get_persconffile_path("", FALSE); about_folders_row(table, "Personal configuration", path, "\"dfilters\", \"preferences\", \"ethers\", ..."); g_free(path); diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index 6750a9c60c..e772099bb9 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -686,7 +686,7 @@ decode_show_save_cb (GtkWidget *win _U_, gpointer user_data _U_) return; } - daf_path = get_persconffile_path(DECODE_AS_ENTRIES_FILE_NAME, TRUE, TRUE); + daf_path = get_persconffile_path(DECODE_AS_ENTRIES_FILE_NAME, TRUE); if ((daf = ws_fopen(daf_path, "w")) == NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Can't open decode_as_entries file\n\"%s\": %s.", daf_path, @@ -2221,7 +2221,7 @@ void load_decode_as_entries(void) decode_clear_all(FALSE); } - daf_path = get_persconffile_path(DECODE_AS_ENTRIES_FILE_NAME, TRUE, FALSE); + daf_path = get_persconffile_path(DECODE_AS_ENTRIES_FILE_NAME, TRUE); if ((daf = ws_fopen(daf_path, "r")) != NULL) { read_prefs_file(daf_path, daf, read_set_decode_as_entries, NULL); fclose(daf); diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 3bab40df69..4467c52d29 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2944,7 +2944,7 @@ main(int argc, char *argv[]) #else gtk_rc_parse(rc_file); g_free(rc_file); - rc_file = get_persconffile_path(RC_FILE, FALSE, FALSE); + rc_file = get_persconffile_path(RC_FILE, FALSE); gtk_rc_parse(rc_file); #endif g_free(rc_file); diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index eddb9ebf93..6197bc89c1 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -1006,7 +1006,7 @@ int main(int argc, char *argv[]) // #else // gtk_rc_parse(rc_file); // g_free(rc_file); -// rc_file = get_persconffile_path(RC_FILE, FALSE, FALSE); +// rc_file = get_persconffile_path(RC_FILE, FALSE); // gtk_rc_parse(rc_file); // #endif // g_free(rc_file); diff --git a/ui/recent.c b/ui/recent.c index 6772565b42..db1881e585 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -310,7 +310,7 @@ write_recent(void) return FALSE; } - rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, TRUE); + rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE); if ((rf = ws_fopen(rf_path, "w")) == NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Can't open recent file\n\"%s\": %s.", rf_path, @@ -433,7 +433,7 @@ write_profile_recent(void) return FALSE; } - rf_path = get_persconffile_path(RECENT_FILE_NAME, TRUE, TRUE); + rf_path = get_persconffile_path(RECENT_FILE_NAME, TRUE); if ((rf = ws_fopen(rf_path, "w")) == NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Can't open recent file\n\"%s\": %s.", rf_path, @@ -952,7 +952,7 @@ recent_read_static(char **rf_path_return, int *rf_errno_return) recent.gui_fileopen_remembered_dir = NULL; /* Construct the pathname of the user's recent common file. */ - rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, FALSE); + rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE); /* Read the user's recent common file, if it exists. */ *rf_path_return = NULL; @@ -1017,7 +1017,7 @@ recent_read_profile_static(char **rf_path_return, int *rf_errno_return) } /* Construct the pathname of the user's profile recent file. */ - rf_path = get_persconffile_path(RECENT_FILE_NAME, TRUE, FALSE); + rf_path = get_persconffile_path(RECENT_FILE_NAME, TRUE); /* Read the user's recent file, if it exists. */ *rf_path_return = NULL; @@ -1034,7 +1034,7 @@ recent_read_profile_static(char **rf_path_return, int *rf_errno_return) * know what's supposed to happen at this point. * ToDo: Determine if the "recent common file" should be read at this point */ - rf_common_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, FALSE); + rf_common_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE); if (!file_exists(rf_common_path)) { /* Read older common settings from recent file */ rf = ws_fopen(rf_path, "r"); @@ -1064,11 +1064,11 @@ recent_read_dynamic(char **rf_path_return, int *rf_errno_return) /* Construct the pathname of the user's recent common file. */ - rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE, FALSE); + rf_path = get_persconffile_path(RECENT_COMMON_FILE_NAME, FALSE); if (!file_exists (rf_path)) { /* Recent common file does not exist, read from default recent */ g_free (rf_path); - rf_path = get_persconffile_path(RECENT_FILE_NAME, FALSE, FALSE); + rf_path = get_persconffile_path(RECENT_FILE_NAME, FALSE); } /* Read the user's recent file, if it exists. */ |