aboutsummaryrefslogtreecommitdiffstats
path: root/epan/color_filters.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-10-09 11:46:00 +0200
committerAnders Broman <a.broman58@gmail.com>2018-10-10 04:46:28 +0000
commite1fc60ddaecaa914e384ae8bc9bf46cca0096df2 (patch)
treeb05c9cf0dc1868925e2d8919603ef87469b13625 /epan/color_filters.c
parenteade1c52cba529f10a2e3133b78c4ddd30ea52e6 (diff)
Qt: Add back pathLabel in some dialogs
Add the pathLabel for Coloring Rules, Decode As, Display Filters and Capture Filter. Put the absolute file path into the pathLabel if the file exists. This aligns with UAT dialogs and frames. Change-Id: I72bd06e31bab220de0a0ef8df99df9a4daed667c Reviewed-on: https://code.wireshark.org/review/30089 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/color_filters.c')
-rw-r--r--epan/color_filters.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c
index 4d3bd098f7..1283f94e5e 100644
--- a/epan/color_filters.c
+++ b/epan/color_filters.c
@@ -287,7 +287,7 @@ color_filters_get(gchar** err_msg, color_filter_add_cb_func add_cb)
* Get the path for the file that would have their filters, and
* try to open it.
*/
- path = get_persconffile_path("colorfilters", TRUE);
+ path = get_persconffile_path(COLORFILTERS_FILE_NAME, TRUE);
if ((f = ws_fopen(path, "r")) == NULL) {
if (errno != ENOENT) {
/* Error trying to open the file; give up. */
@@ -687,7 +687,7 @@ color_filters_read_globals(gpointer user_data, gchar** err_msg, color_filter_add
* Get the path for the file that would have the global filters, and
* try to open it.
*/
- path = get_datafile_path("colorfilters");
+ path = get_datafile_path(COLORFILTERS_FILE_NAME);
if ((f = ws_fopen(path, "r")) == NULL) {
if (errno != ENOENT) {
/* Error trying to open the file; give up. */
@@ -804,7 +804,7 @@ color_filters_write(GSList *cfl, gchar** err_msg)
return FALSE;
}
- path = get_persconffile_path("colorfilters", TRUE);
+ path = get_persconffile_path(COLORFILTERS_FILE_NAME, TRUE);
if ((f = ws_fopen(path, "w+")) == NULL) {
*err_msg = g_strdup_printf("Could not open\n%s\nfor writing: %s.",
path, g_strerror(errno));