Actually, I think File/Reload is still used if you do a capture with

"-F" - you do a File/Reload to see any new packets that showed up since
the last time the file was loaded.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@387 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/ethereal.c b/ethereal.c
index 8cc5b94ccda9317d8381f263bfd6469d5bcfe2bd..5121e83e00caad2673b93aa673c83399451c08ef 100644 (file)
--- a/ethereal.c
+++ b/ethereal.c
@@ -1,6 +1,6 @@
 /* ethereal.c
  *
- * $Id: ethereal.c,v 1.63 1999/07/27 01:58:42 guy Exp $
+ * $Id: ethereal.c,v 1.64 1999/07/27 02:04:35 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -510,6 +510,24 @@ file_save_as_ok_cb(GtkWidget *w, GtkFileSelection *fs) {
        set_menu_sensitivity("/File/Save As...", TRUE);
 }
 
+/* Reload a file using the current display filter */
+void
+file_reload_cmd_cb(GtkWidget *w, gpointer data) {
+  /*GtkWidget *filter_te = gtk_object_get_data(GTK_OBJECT(w), E_DFILTER_TE_KEY);*/
+  GtkWidget *filter_te;
+  int err;
+
+  filter_te = gtk_object_get_data(GTK_OBJECT(w), E_DFILTER_TE_KEY);
+
+  if (cf.dfilter) g_free(cf.dfilter);
+  cf.dfilter = g_strdup(gtk_entry_get_text(GTK_ENTRY(filter_te)));
+  err = load_cap_file(cf.filename, &cf);
+  if (err != 0) {
+    simple_dialog(ESD_TYPE_WARN, NULL, file_open_error_message(err, FALSE),
+               cf.filename);
+  }
+}
+
 /* Run the current display filter on the current packet set, and
    redisplay. */
 static void
@@ -1288,6 +1306,7 @@ main(int argc, char *argv[])
   gtk_widget_show(filter_te);
 
   set_menu_object_data("/File/Open...", E_DFILTER_TE_KEY, filter_te);
+  set_menu_object_data("/File/Reload", E_DFILTER_TE_KEY, filter_te);
   set_menu_object_data("/Tools/Follow TCP Stream", E_DFILTER_TE_KEY,
     filter_te);
   info_bar = gtk_statusbar_new();

diff --git a/ethereal.h b/ethereal.h
index 6d906f5f6f1c08c9becf1c821fb76f35cef8e357..2c61ec0cc9fa8e70d6a7622ff731f7f44f87a00d 100644 (file)
--- a/ethereal.h
+++ b/ethereal.h
@@ -1,7 +1,7 @@
 /* ethereal.h
  * Global defines, etc.
  *
- * $Id: ethereal.h,v 1.19 1999/07/27 01:58:41 guy Exp $
+ * $Id: ethereal.h,v 1.20 1999/07/27 02:04:35 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -92,6 +92,7 @@ void file_save_cmd_cb(GtkWidget *, gpointer);
 void file_save_as_cmd_cb(GtkWidget *, gpointer);
 void file_close_cmd_cb(GtkWidget *, gpointer);
 void file_quit_cmd_cb(GtkWidget *, gpointer);
+void file_reload_cmd_cb(GtkWidget *, gpointer);
 void file_print_cmd_cb(GtkWidget *, gpointer);
 void file_print_packet_cmd_cb(GtkWidget *, gpointer);
 void main_realize_cb(GtkWidget *, gpointer);

diff --git a/file.c b/file.c
index 6832935451fc65eeeaf37826b9231a28bdca2370..f48e7a568dbc8f60675ea2d0268ca942a12eae87 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.45 1999/07/27 01:58:42 guy Exp $
+ * $Id: file.c,v 1.46 1999/07/27 02:04:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -178,6 +178,7 @@ close_cap_file(capture_file *cf, void *w, guint context) {
   set_menu_sensitivity("/File/Save", FALSE);
   set_menu_sensitivity("/File/Save As...", FALSE);
   set_menu_sensitivity("/File/Close", FALSE);
+  set_menu_sensitivity("/File/Reload", FALSE);
   set_menu_sensitivity("/File/Print...", FALSE);
   set_menu_sensitivity("/Display/Options...", FALSE);
   set_menu_sensitivity("/Tools/Summary", FALSE);
@@ -238,6 +239,7 @@ load_cap_file(char *fname, capture_file *cf) {
 
     /* Enable menu items that make sense if you have a capture. */
     set_menu_sensitivity("/File/Close", TRUE);
+    set_menu_sensitivity("/File/Reload", TRUE);
     set_menu_sensitivity("/File/Print...", TRUE);
     set_menu_sensitivity("/Display/Options...", TRUE);
     set_menu_sensitivity("/Tools/Summary", TRUE);
@@ -295,6 +297,7 @@ cap_file_input_cb (gpointer data, gint source, GdkInputCondition condition) {
     set_menu_sensitivity("/File/Close", TRUE);
     set_menu_sensitivity("/File/Save As...", TRUE);
     set_menu_sensitivity("/File/Print...", TRUE);
+    set_menu_sensitivity("/File/Reload", TRUE);
     set_menu_sensitivity("/Capture/Start...", TRUE);
     set_menu_sensitivity("/Tools/Capture...", TRUE);
     set_menu_sensitivity("/Tools/Summary", TRUE);

diff --git a/menu.c b/menu.c
index 444eb8ec2e3057b49ae47247f81d648bd34bd6fb..32d4be12165b908988e37f63f70776bd1c35845e 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.29 1999/07/27 01:58:43 guy Exp $
+ * $Id: menu.c,v 1.30 1999/07/27 02:04:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -78,6 +78,7 @@ static GtkItemFactoryEntry menu_items[] =
   {"/File/_Close", "<control>W", GTK_MENU_FUNC(file_close_cmd_cb), 0, NULL},
   {"/File/_Save", "<control>S", GTK_MENU_FUNC(file_save_cmd_cb), 0, NULL},
   {"/File/Save _As...", NULL, GTK_MENU_FUNC(file_save_as_cmd_cb), 0, NULL},
+  {"/File/_Reload", "<control>R", GTK_MENU_FUNC(file_reload_cmd_cb), 0, NULL},
   {"/File/<separator>", NULL, NULL, 0, "<Separator>"},
   {"/File/Print...", NULL, GTK_MENU_FUNC(file_print_cmd_cb), 0, NULL},
   {"/File/Print Pac_ket", "<control>P", GTK_MENU_FUNC(file_print_packet_cmd_cb), 0, NULL},
@@ -141,6 +142,7 @@ menus_init(void) {
     set_menu_sensitivity("/File/Close", FALSE);
     set_menu_sensitivity("/File/Save", FALSE);
     set_menu_sensitivity("/File/Save As...", FALSE);
+    set_menu_sensitivity("/File/Reload", FALSE);
     set_menu_sensitivity("/File/Print...", FALSE);
     set_menu_sensitivity("/File/Print Packet", FALSE);
     set_menu_sensitivity("/Edit/Cut", FALSE);