osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Didier Gautheron via bug 3532: 

Reset the detail pane protocol preferences menu on profile switching.

svn path=/trunk/; revision=28719
This commit is contained in:
Stig Bjørlykke 2009-06-13 23:32:08 +00:00
parent 6b64331033
commit 9fe70f3a2a
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/main.c
View File

@ -3358,6 +3358,8 @@ void change_configuration_profile (const gchar *profile_name)
/* Reset current preferences and apply the new */
prefs_reset();
menu_prefs_reset();
(void) read_configuration_files (&gdp_path, &dp_path);
recent_read_profile_static(&rf_path, &rf_open_errno);

11
gtk/main_menu.c
View File

@ -2778,6 +2778,13 @@ menu_prefs_change_enum (GtkWidget *w, gpointer data)
}
}
void
menu_prefs_reset(void)
{
g_free (g_object_get_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev"));
g_object_set_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev", NULL);
}
static void
menu_prefs_change_ok (GtkWidget *w, gpointer parent_w)
{
@ -2832,9 +2839,7 @@ menu_prefs_change_ok (GtkWidget *w, gpointer parent_w)
if (module->prefs_changed) {
/* Ensure we reload the sub menu */
g_free (g_object_get_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev"));
g_object_set_data(G_OBJECT(tree_view_menu_factory), "menu_abbrev", NULL);
menu_prefs_reset();
prefs_apply (module);
if (!prefs.gui_use_pref_save) {
prefs_main_write();

3
gtk/main_menu.h
View File

@ -62,6 +62,9 @@ extern void menu_name_resolution_changed(void);
/** The "Colorize Packet List" option changed. */
extern void menu_colorize_changed(gboolean packet_list_colorize);
/* Reset preferences menu on profile or preference change. */
extern void menu_prefs_reset(void);
#ifdef HAVE_LIBPCAP
/** The "Auto Scroll Packet List in Live Capture" option changed. */
extern void menu_auto_scroll_live_changed(gboolean auto_scroll_in);