Change the "user_saved" member of a capture_file structure to

"unsaved_changes", and have it be TRUE iff changes have been made to the
file since it was read - *not* if it's a temporary file from a live
capture.

Check the "is_tempfile" member, and the "unsaved_changes" member, when
appropriate.

Just have a set_toolbar_for_capture_file() routine that updates the
"save", "close", and "reload" toolbar as appropriate, given a
capture_file structure - absorb the function of
set_toolbar_for_unsaved_capture_file() into it.

svn path=/trunk/; revision=42721

1 files changed, 12 insertions, 12 deletions

diff --git a/cfile.c b/cfile.c
index 3463c1d538..e3e5cb2c35 100644
--- a/cfile.c
+++ b/cfile.c
@@ -37,16 +37,16 @@ void
 cap_file_init(capture_file *cf)
 {
   /* Initialize the capture file struct */
-  cf->filename      = NULL;
-  cf->source        = NULL;
-  cf->is_tempfile   = FALSE;
-  cf->user_saved    = FALSE;
-  cf->count         = 0;
-  cf->has_snap      = FALSE;
-  cf->snap          = WTAP_MAX_PACKET_SIZE;
-  cf->wth           = NULL;
-  cf->rfcode        = NULL;
-  cf->dfilter       = NULL;
-  cf->redissecting  = FALSE;
-  cf->frames        = NULL;
+  cf->filename        = NULL;
+  cf->source          = NULL;
+  cf->is_tempfile     = FALSE;
+  cf->unsaved_changes = FALSE;
+  cf->count           = 0;
+  cf->has_snap        = FALSE;
+  cf->snap            = WTAP_MAX_PACKET_SIZE;
+  cf->wth             = NULL;
+  cf->rfcode          = NULL;
+  cf->dfilter         = NULL;
+  cf->redissecting    = FALSE;
+  cf->frames          = NULL;
 }