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

Arrange things so that if '-o "capture.auto_scroll: FALSE"' is passed to 

Wireshark on the command line, auto-scroll is actually disabled.

svn path=/trunk/; revision=24172
This commit is contained in:
Gerald Combs 2008-01-24 01:23:19 +00:00
parent fb32ed8812
commit 690f8f51f8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/main.c
View File

@ -2227,9 +2227,6 @@ read_configuration_files(char **gdp_path, char **dp_path)
}
#endif
/* Fill in capture options with values from the preferences */
prefs_to_capture_opts();
/* Read the capture filter file. */
read_filter_list(CFILTER_LIST, &cf_path, &cf_open_errno);
if (cf_path != NULL) {
@ -2945,6 +2942,9 @@ main(int argc, char *argv[])
exit(status);
}
/* Fill in capture options with values from the preferences */
prefs_to_capture_opts();
capture_opts_trim_snaplen(capture_opts, MIN_PACKET_SIZE);
capture_opts_trim_ring_num_files(capture_opts);
#endif /* HAVE_LIBPCAP */
@ -2992,6 +2992,8 @@ main(int argc, char *argv[])
packet_list_set_column_titles();
menu_recent_read_finished();
menu_auto_scroll_live_changed(auto_scroll_live);
switch (user_font_apply()) {
case FA_SUCCESS:
@ -5031,7 +5033,7 @@ void change_configuration_profile (const gchar *profile_name)
prefs_reset();
(void) read_configuration_files (&gdp_path, &dp_path);
prefs_apply_all();
/* Update window view and redraw the toolbar */
update_main_window_name();
toolbar_redraw_all();