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, 5 insertions, 11 deletions

diff --git a/ui/gtk/main_toolbar.h b/ui/gtk/main_toolbar.h
index 5d7743e458..701798340b 100644
--- a/ui/gtk/main_toolbar.h
+++ b/ui/gtk/main_toolbar.h
@@ -50,18 +50,12 @@ void toolbar_colorize_changed(gboolean packet_list_colorize);
 void toolbar_auto_scroll_live_changed(gboolean auto_scroll_live);
 #endif
 
-/** We have (or don't have) a capture file now.
- *
- * @param have_capture_file TRUE, if we have a capture file
- * @param can_save_as TRUE, if we can save this capture file
- */
-void set_toolbar_for_capture_file(gboolean have_capture_file, gboolean can_save_as);
-
-/** We have (or don't have) an unsaved capture file now.
- *
- * @param have_unsaved_capture_file TRUE, if we have an unsaved capture file
+/* Enable or disable toolbar items based on whether you have a capture file
+ * and, if so, whether you've finished reading it and whether there's stuff
+ * in it that hasn't yet been saved to a permanent file.
+ * @param cf cfile_t for the capture file in question
  */
-void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file);
+void set_toolbar_for_capture_file(capture_file *cf);
 
 /** We have (or don't have) a capture in progress now.
  *