When saving packets, we have a "Save only marked packets" option; label

the option to print only marked packets similarly, rather than as
"Suppress unmarked packets" (for consistency, and because the latter
isn't unlike a double negative).

svn path=/trunk/; revision=8451

4 files changed, 18 insertions, 20 deletions

diff --git a/file.c b/file.c
index 3887f51ae0..8442192f8d 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.308 2003/09/08 21:08:43 sahlberg Exp $
+ * $Id: file.c,v 1.309 2003/09/10 22:23:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1273,8 +1273,8 @@ print_packets(capture_file *cf, print_args_t *print_args)
     /* Check to see if we are suppressing unmarked packets, if so,
      * suppress them and then proceed to check for visibility.
      */
-    if (((print_args->suppress_unmarked && fdata->flags.marked ) ||
-        !(print_args->suppress_unmarked)) && fdata->flags.passed_dfilter) {
+    if (((print_args->print_only_marked && fdata->flags.marked ) ||
+        !(print_args->print_only_marked)) && fdata->flags.passed_dfilter) {
       if (!wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header,
       			   cf->pd, fdata->cap_len, &err)) {
         simple_dialog(ESD_TYPE_CRIT, NULL,
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index bf6264f64e..35e106da91 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
 /* print_dlg.c
  * Dialog boxes for printing
  *
- * $Id: print_dlg.c,v 1.41 2003/02/21 21:06:27 guy Exp $
+ * $Id: print_dlg.c,v 1.42 2003/09/10 22:23:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -83,7 +83,7 @@ static gint	print_format = PR_FMT_TEXT;
 #define PRINT_HEX_CB_KEY          "printer_hex_check_button"
 #define PRINT_EXPAND_ALL_RB_KEY   "printer_expand_all_radio_button"
 #define PRINT_AS_DISPLAYED_RB_KEY "printer_as_displayed_radio_button"
-#define PRINT_SUPPRESS_UNMARKED_CB_KEY "printer_suppress_unmarked_check_button"
+#define PRINT_PRINT_ONLY_MARKED_CB_KEY "printer_print_only_marked_check_button"
 
 #define E_FS_CALLER_PTR_KEY       "fs_caller_ptr"
 #define E_FILE_SEL_DIALOG_PTR_KEY "file_sel_dialog_ptr"
@@ -338,12 +338,12 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   gtk_container_add(GTK_CONTAINER(print_type_vb), hex_cb);
   gtk_widget_show(hex_cb);
 
-  /* "Suppress Unmarked" check button. */
+  /* "Print only marked packets" check button. */
 #if GTK_MAJOR_VERSION < 2
-  marked_cb = dlg_check_button_new_with_label_with_mnemonic("Suppress _unmarked frames",
+  marked_cb = dlg_check_button_new_with_label_with_mnemonic("Print only _marked frames",
                                                             accel_group);
 #else
-  marked_cb = gtk_check_button_new_with_mnemonic("Suppress _unmarked frames");
+  marked_cb = gtk_check_button_new_with_mnemonic("Print only _marked frames");
 #endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(marked_cb), FALSE);
   gtk_container_add(GTK_CONTAINER(print_type_vb), marked_cb);
@@ -408,7 +408,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   OBJECT_SET_DATA(ok_bt, PRINT_SUMMARY_RB_KEY, summary_rb);
   OBJECT_SET_DATA(ok_bt, PRINT_HEX_CB_KEY, hex_cb);
   OBJECT_SET_DATA(ok_bt, PRINT_EXPAND_ALL_RB_KEY, expand_all_rb);
-  OBJECT_SET_DATA(ok_bt, PRINT_SUPPRESS_UNMARKED_CB_KEY, marked_cb);
+  OBJECT_SET_DATA(ok_bt, PRINT_PRINT_ONLY_MARKED_CB_KEY, marked_cb);
   SIGNAL_CONNECT(ok_bt, "clicked", print_ok_cb, print_w);
   GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
@@ -671,8 +671,8 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
   button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_EXPAND_ALL_RB_KEY);
   print_args.expand_all = GTK_TOGGLE_BUTTON (button)->active;
 
-  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_SUPPRESS_UNMARKED_CB_KEY);
-  print_args.suppress_unmarked = GTK_TOGGLE_BUTTON (button)->active;
+  button = (GtkWidget *)OBJECT_GET_DATA(ok_bt, PRINT_PRINT_ONLY_MARKED_CB_KEY);
+  print_args.print_only_marked = GTK_TOGGLE_BUTTON (button)->active;
 
   gtk_widget_destroy(GTK_WIDGET(parent_w));
 
@@ -781,7 +781,7 @@ file_print_packet_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
   print_args.print_summary = FALSE;
   print_args.print_hex = FALSE;
   print_args.expand_all = TRUE;
-  print_args.suppress_unmarked = FALSE;
+  print_args.print_only_marked = FALSE;
   proto_tree_print(&print_args, cfile.edt, fh);
   print_finale(fh, prefs.pr_format);
   close_print_dest(print_args.to_file, fh);
diff --git a/print.h b/print.h
index b1f9013dc2..4ac47484c3 100644
--- a/print.h
+++ b/print.h
@@ -1,7 +1,7 @@
 /* print.h
  * Definitions for printing packet analysis trees.
  *
- * $Id: print.h,v 1.29 2002/08/28 21:00:40 jmayer Exp $
+ * $Id: print.h,v 1.30 2003/09/10 22:23:58 guy Exp $
  *
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
@@ -43,11 +43,9 @@ typedef struct {
 				   FALSE if we should print only if not dissected. */
   gboolean	expand_all;	/* TRUE if we should expand all levels;
 				   FALSE if we should expand as displayed. */
-  gboolean      suppress_unmarked; /* TRUE if we should suppress unmarked
-				     frames FALSE if we should allow
-				     both marked and unmarked frames to be
-				     printed.
-				  */
+  gboolean      print_only_marked; /* TRUE if we should print only marked
+				      frames; FALSE if we should print
+				      all frames. */
 } print_args_t;
 
 /* Functions in print.h */
diff --git a/tethereal.c b/tethereal.c
index 3e14a584bc..3ca726f1cc 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.195 2003/09/10 05:35:24 guy Exp $
+ * $Id: tethereal.c,v 1.196 2003/09/10 22:23:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2350,7 +2350,7 @@ wtap_dispatch_cb_print(guchar *user, const struct wtap_pkthdr *phdr,
       print_args.print_summary = FALSE;
       print_args.print_hex = print_hex;
       print_args.expand_all = TRUE;
-      print_args.suppress_unmarked = FALSE;
+      print_args.print_only_marked = FALSE;
       proto_tree_print(&print_args, edt, stdout);
       if (!print_hex) {
         /* "print_hex_data()" will put out a leading blank line, as well