As suggested by Anders: back out 37112.

[obnox/wireshark/wip.git] / progress_dlg.h

diff --git a/progress_dlg.h b/progress_dlg.h
index c50108b2b25e6096c822ab761a57401e601124b8..0f404c71d702be819158aeb819f47b7044bb61e8 100644 (file)
--- a/progress_dlg.h
+++ b/progress_dlg.h
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -44,12 +44,15 @@ typedef struct progdlg progdlg_t;
  *
  * @param task_title the task to do, e.g. "Loading"
  * @param item_title the item to do, e.g. "capture.cap"
+ * @param terminate_is_stop TRUE if the operation can't be cancelled, just
+ *   stopped (i.e., it has a "Stop" button and clicking it doesn't undo
+ *   anything already done), FALSE if it can
  * @param stop_flag a pointer to a Boolean variable that will be
  *   set to TRUE if the user hits that button
  * @return the newly created progress dialog
  */
 progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title,
-    gboolean *stop_flag);
+    gboolean terminate_is_stop, gboolean *stop_flag);
 
 /**
  * Create a progress dialog, but only if it's not likely to disappear
@@ -57,6 +60,9 @@ progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title,
  *
  * @param task_title the task to do, e.g. "Loading"
  * @param item_title the item to do, e.g. "capture.cap"
+ * @param terminate_is_stop TRUE if the operation can't be cancelled, just
+ *   stopped (i.e., it has a "Stop" button and clicking it doesn't undo
+ *   anything already done), FALSE if it can
  * @param stop_flag a pointer to a Boolean variable that will be
  *   set to TRUE if the user hits that button
  * @param start_time a pointer to a GTimeVal structure which holds
@@ -66,7 +72,8 @@ progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title,
  */
 progdlg_t *
 delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
-    gboolean *stop_flag, const GTimeVal *start_time, gfloat progress);
+    gboolean terminate_is_stop, gboolean *stop_flag,
+    const GTimeVal *start_time, gfloat progress);
 
 /**
  * Update the progress information of the progress dialog box.
@@ -75,7 +82,7 @@ delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
  * @param percentage the current percentage value (0..1)
  * @param status the new status string to show, e.g. "3000KB of 6000KB"
  */
-void update_progress_dlg(progdlg_t *dlg, gfloat percentage, gchar *status);
+void update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status);
 
 /**
  * Destroy the progress bar.