diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-20 15:49:35 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-21 02:57:46 +0000 |
| commit | 5012cf84e6d84a448171dac64c14d9c83e3d4ae6 (patch) | |
| tree | 773c91ab40bf3f09656b51addb072555c5c57f4d /epan/prefs.h | |
| parent | ae9cc88c007a61bde620f9efd5c422751388fff3 (diff) | |
Call pre_init_prefs each time our profile changes.
Manually back out gafa96c3 so that we can set our preferences to their
default values each time we switch profiles.
Zero the prefs struct at startup.
Change-Id: Ic28db44cd0c4cdf640e977d7277f7357db10ebe8
Reviewed-on: https://code.wireshark.org/review/7282
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/prefs.h')
| -rw-r--r-- | epan/prefs.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/prefs.h b/epan/prefs.h index a91864b1f2..d84de317cf 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -135,10 +135,10 @@ typedef enum { } software_update_channel_e; typedef struct _e_prefs { - gint pr_format; - gint pr_dest; - const gchar *pr_file; - const gchar *pr_cmd; + gint pr_format; + gint pr_dest; + gchar *pr_file; + gchar *pr_cmd; GList *col_list; gint num_cols; color_t st_client_fg, st_client_bg, st_server_fg, st_server_bg; @@ -157,8 +157,8 @@ typedef struct _e_prefs { color_t gui_marked_bg; color_t gui_ignored_fg; color_t gui_ignored_bg; - const gchar *gui_colorized_fg; - const gchar *gui_colorized_bg; + gchar *gui_colorized_fg; + gchar *gui_colorized_bg; gboolean gui_geometry_save_position; gboolean gui_geometry_save_size; gboolean gui_geometry_save_maximized; @@ -174,7 +174,7 @@ typedef struct _e_prefs { gboolean gui_use_pref_save; gchar *gui_webbrowser; gchar *gui_window_title; - const gchar *gui_start_title; + gchar *gui_start_title; version_info_e gui_version_placement; gboolean gui_auto_scroll_on_expand; guint gui_auto_scroll_percentage; |