The GUI's state machine requires that, when reloading a capture after a

save, we post capture file callback events similar to the ones posted
when reading a capture - otherwise, the reload will leave the welcome
screen up.

Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished,
add a cf_cb_file_reload_started callback, have them work similarly to
read_finished and read_started except that the reload uses "Reloading"
in the progress bar and status bar.

Clean up some indentation while we're at it.

svn path=/trunk/; revision=42764

1 files changed, 8 insertions, 7 deletions

diff --git a/file.h b/file.h
index d42f793efe..1b093e3c7e 100644
--- a/file.h
+++ b/file.h
@@ -40,20 +40,20 @@ extern "C" {
 
 /** Return values from functions that only can succeed or fail. */
 typedef enum {
-	CF_OK,			    /**< operation succeeded */
-	CF_ERROR	/**< operation got an error (function may provide err with details) */
+    CF_OK,      /**< operation succeeded */
+    CF_ERROR    /**< operation got an error (function may provide err with details) */
 } cf_status_t;
 
 /** Return values from functions that read capture files. */
 typedef enum {
-	CF_READ_OK,		/**< operation succeeded */
-	CF_READ_ERROR,		/**< operation got an error (function may provide err with details) */
-	CF_READ_ABORTED		/**< operation aborted by user */
+    CF_READ_OK,	     /**< operation succeeded */
+    CF_READ_ERROR,   /**< operation got an error (function may provide err with details) */
+    CF_READ_ABORTED  /**< operation aborted by user */
 } cf_read_status_t;
 
 /** Return values from functions that print sets of packets. */
 typedef enum {
-	CF_PRINT_OK,		    /**< print operation succeeded */
+	CF_PRINT_OK,            /**< print operation succeeded */
 	CF_PRINT_OPEN_ERROR,    /**< print operation failed while opening printer */
 	CF_PRINT_WRITE_ERROR    /**< print operation failed while writing to the printer */
 } cf_print_status_t;
@@ -63,12 +63,13 @@ typedef enum {
     cf_cb_file_closed,
     cf_cb_file_read_started,
     cf_cb_file_read_finished,
+    cf_cb_file_reload_started,
+    cf_cb_file_reload_finished,
     cf_cb_packet_selected,
     cf_cb_packet_unselected,
     cf_cb_field_unselected,
     cf_cb_file_save_started,
     cf_cb_file_save_finished,
-    cf_cb_file_save_reload_finished,
     cf_cb_file_save_failed
 } cf_cbs;