diff options
| -rw-r--r-- | capture.c | 4 | ||||
| -rw-r--r-- | file.c | 8 | ||||
| -rw-r--r-- | globals.h | 3 | ||||
| -rw-r--r-- | gtk/main.c | 4 |
4 files changed, 8 insertions, 11 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.148 2001/04/13 14:59:28 jfoster Exp $ + * $Id: capture.c,v 1.149 2001/05/01 00:18:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -303,7 +303,7 @@ do_capture(char *capfile_name) g_assert(cfile.save_file == NULL); cfile.save_file = capfile_name; - if (prefs.capture_auto_scroll) { /* do the capture in a child process */ + if (prefs.capture_real_time) { /* do the capture in a child process */ char ssnap[24]; char scount[24]; /* need a constant for len of numbers */ char save_file_fd[24]; @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.235 2001/03/24 02:14:54 guy Exp $ + * $Id: file.c,v 1.236 2001/05/01 00:18:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -94,8 +94,6 @@ extern GtkWidget *packet_list, *info_bar, *byte_nb_ptr, *tree_view; extern guint file_ctx; -gboolean auto_scroll_live = FALSE; - static guint32 firstsec, firstusec; static guint32 prevsec, prevusec; @@ -494,7 +492,7 @@ continue_tail_cap_file(capture_file *cf, int to_read, int *err) /* XXX - this cheats and looks inside the packet list to find the final row number. */ - if (auto_scroll_live && cf->plist_end != NULL) + if (prefs.capture_auto_scroll && cf->plist_end != NULL) gtk_clist_moveto(GTK_CLIST(packet_list), GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0); @@ -541,7 +539,7 @@ finish_tail_cap_file(capture_file *cf, int *err) } thaw_clist(cf); - if (auto_scroll_live && cf->plist_end != NULL) + if (prefs.capture_auto_scroll && cf->plist_end != NULL) /* XXX - this cheats and looks inside the packet list to find the final row number. */ gtk_clist_moveto(GTK_CLIST(packet_list), @@ -1,7 +1,7 @@ /* globals.h * Global defines, etc. * - * $Id: globals.h,v 1.24 2001/03/27 06:48:11 guy Exp $ + * $Id: globals.h,v 1.25 2001/05/01 00:18:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -36,7 +36,6 @@ extern capture_file cfile; extern guint main_ctx, file_ctx; extern gchar *ethereal_path; extern gchar *last_open_dir; -extern gboolean auto_scroll_live; extern field_info *finfo_selected; extern ts_type timestamp_type; diff --git a/gtk/main.c b/gtk/main.c index 5629d5eafc..df9f2df321 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.196 2001/04/24 00:28:21 guy Exp $ + * $Id: main.c,v 1.197 2001/05/01 00:18:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1088,7 +1088,7 @@ main(int argc, char *argv[]) break; case 'S': /* "Sync" mode: used for following file ala tail -f */ #ifdef HAVE_LIBPCAP - prefs->capture_auto_scroll = TRUE; + prefs->capture_real_time = TRUE; #else capture_option_specified = TRUE; arg_error = TRUE; |