diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-02-28 23:05:09 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-02-28 23:05:09 +0000 |
commit | 2115cd7696fc8cdae3af00bab96b52e1c9f47fe0 (patch) | |
tree | 004004eee0661c19bbb7de017c0ec3045bdea3a3 /color_filters.h | |
parent | 663e6a6d6b3a3e03677c5fefea3f50e1157c2b7a (diff) |
color_edit_dlg update:
- Significantly simplify & rework code;
- Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer.
- Minor UI cleanup (default buttons & etc)
- Fix crash which occurred in the (existing) GTK3 related code.
- Fix some other relatively minor bugs (including some minor memory leaks);
- Remove some old, commented-out code;
- Use a more consistent naming scheme for certain variables.
svn path=/trunk/; revision=47958
Diffstat (limited to 'color_filters.h')
-rw-r--r-- | color_filters.h | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/color_filters.h b/color_filters.h index 5ada0fd10d..05a0c09e55 100644 --- a/color_filters.h +++ b/color_filters.h @@ -35,19 +35,18 @@ extern "C" { /* Data for a color filter. */ typedef struct _color_filter { - gchar *filter_name; /* name of the filter */ - gchar *filter_text; /* text of the filter expression */ - color_t bg_color; /* background color for packets that match */ - color_t fg_color; /* foreground color for packets that match */ - gboolean disabled; /* set if the filter is disabled */ - gboolean selected; /* set if the filter is selected in the color dialog box */ - - /* only used inside of color_filters.c */ - dfilter_t *c_colorfilter; /* compiled filter expression */ - - /* only used outside of color_filters.c (beside init) */ - void *edit_dialog; /* if filter is being edited, dialog - * box for it */ + gchar *filter_name; /* name of the filter */ + gchar *filter_text; /* text of the filter expression */ + color_t bg_color; /* background color for packets that match */ + color_t fg_color; /* foreground color for packets that match */ + gboolean disabled; /* set if the filter is disabled */ + gboolean selected; /* set if the filter is selected in the color dialog box */ + + /* only used inside of color_filters.c */ + dfilter_t *c_colorfilter; /* compiled filter expression */ + + /* only used outside of color_filters.c (beside init) */ + void *color_edit_dlg_info; /* if filter is being edited, ptr to req'd info */ } color_filter_t; @@ -199,3 +198,16 @@ void color_filter_list_delete(GSList **cfl); #endif /* __cplusplus */ #endif + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |