diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2006-10-02 23:01:33 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2006-10-02 23:01:33 +0000 |
commit | 59d206d18e8b059239b4e52cdc30a8adb144b547 (patch) | |
tree | b065af5c3cf5297acd2cc58184cf29f1ff14ef92 /color_filters.c | |
parent | b2c8fb8f5584e06e2c642ef16f51afff12e389c5 (diff) |
further code cleanup: don't use the term "marked" for the color filters, the right term is "selected". That caused me "concerns" wether the marked feature of the packet list was involved - which is actually not
svn path=/trunk/; revision=19399
Diffstat (limited to 'color_filters.c')
-rw-r--r-- | color_filters.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/color_filters.c b/color_filters.c index eba1867825..ffc7561834 100644 --- a/color_filters.c +++ b/color_filters.c @@ -44,7 +44,7 @@ #include "simple_dialog.h" #include "ui_util.h" -static gboolean read_filters(void); +static gboolean read_users_filters(void); static gboolean read_global_filters(void); /* Variables and routines defined in color.h */ @@ -70,7 +70,7 @@ void color_filter_remove(color_filter_t *colorf) /* delete the specified filter */ static void -delete_color_filter(color_filter_t *colorf) +color_filter_delete(color_filter_t *colorf) { if (colorf->filter_name != NULL) g_free(colorf->filter_name); @@ -81,22 +81,25 @@ delete_color_filter(color_filter_t *colorf) g_free(colorf); } -/* delete the specified filter as an iterator */ +/* delete the specified filter (called from g_slist_foreach) */ static void -delete_color_filter_it(gpointer filter_arg, gpointer unused _U_) +color_filter_delete_cb(gpointer filter_arg, gpointer unused _U_) { color_filter_t *colorf = filter_arg; - delete_color_filter(colorf); + color_filter_delete(colorf); } /* delete all the filters */ static void -delete_all_color_filters (void) +color_filters_delete_all(void) { - g_slist_foreach(color_filter_list, delete_color_filter_it, NULL); + /* delete the color_filter_list */ + g_slist_foreach(color_filter_list, color_filter_delete_cb, NULL); g_slist_free(color_filter_list); color_filter_list = NULL; - g_slist_foreach(removed_filter_list, delete_color_filter_it, NULL); + + /* delete the removed_filter_list */ + g_slist_foreach(removed_filter_list, color_filter_delete_cb, NULL); g_slist_free(removed_filter_list); removed_filter_list = NULL; } @@ -105,8 +108,12 @@ delete_all_color_filters (void) void color_filters_init(void) { - delete_all_color_filters(); - if (!read_filters()) + /* delete all existing filters */ + color_filters_delete_all(); + + /* try to read the users filters */ + if (!read_users_filters()) + /* if that failed, try to read the global filters */ read_global_filters(); } @@ -126,7 +133,7 @@ color_filter_new(const gchar *name, /* The name of the filter to create */ colorf->fg_color = *fg_color; colorf->c_colorfilter = NULL; colorf->edit_dialog = NULL; - colorf->marked = FALSE; + colorf->selected = FALSE; color_filter_list = g_slist_append(color_filter_list, colorf); return colorf; } @@ -189,7 +196,6 @@ color_filters_colorize_packet(gint row, epan_dissect_t *edt) } /* read filters from the given file */ - /* XXX - Would it make more sense to use GStrings here instead of reallocing our buffers? */ static gboolean @@ -338,7 +344,7 @@ read_filters_file(FILE *f, gpointer arg) /* read filters from the user's filter file */ static gboolean -read_filters(void) +read_users_filters(void) { gchar *path; FILE *f; @@ -412,7 +418,7 @@ color_filters_import(gchar *path, gpointer arg) struct write_filter_data { FILE * f; - gboolean only_marked; + gboolean only_selected; }; /* save a single filter */ @@ -423,7 +429,7 @@ write_filter(gpointer filter_arg, gpointer data_arg) color_filter_t *colorf = filter_arg; FILE *f = data->f; - if (colorf->marked || !data->only_marked) { + if (colorf->selected || !data->only_selected) { fprintf(f,"@%s@%s@[%d,%d,%d][%d,%d,%d]\n", colorf->filter_name, colorf->filter_text, @@ -438,12 +444,12 @@ write_filter(gpointer filter_arg, gpointer data_arg) /* save filters in a filter file */ static gboolean -write_filters_file(FILE *f, gboolean only_marked) +write_filters_file(FILE *f, gboolean only_selected) { struct write_filter_data data; data.f = f; - data.only_marked = only_marked; + data.only_selected = only_selected; fprintf(f,"# DO NOT EDIT THIS FILE! It was created by Wireshark\n"); g_slist_foreach(color_filter_list, write_filter, &data); @@ -503,6 +509,7 @@ color_filters_revert(void) { gchar *path; + /* try to delete the "old" user color filter file */ path = get_persconffile_path("colorfilters", TRUE); if (!deletefile(path)) { g_free(path); |