preference setting, so "ask for unsaved capture files" can be switched off

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11196 f5534014-38df-0310-8fa8-9805f1628bb7

5 files changed, 23 insertions, 14 deletions

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index da141dfe79..daa25abc04 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
 /* capture_dlg.c
  * Routines for packet capture windows
  *
- * $Id: capture_dlg.c,v 1.134 2004/06/20 13:39:44 ulfl Exp $
+ * $Id: capture_dlg.c,v 1.135 2004/06/20 15:57:09 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1106,7 +1106,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 {
   gpointer  dialog;
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before starting a new capture?" PRIMARY_TEXT_END "\n\n"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 2bc6987496..bd2c83120b 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -1,7 +1,7 @@
 /* file_dlg.c
  * Dialog boxes for handling files
  *
- * $Id: file_dlg.c,v 1.117 2004/06/20 09:35:51 ulfl Exp $
+ * $Id: file_dlg.c,v 1.118 2004/06/20 15:57:09 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -579,7 +579,7 @@ void
 file_open_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   gpointer  dialog;
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
@@ -890,7 +890,7 @@ void
 file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   gpointer  dialog;
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_OK_CANCEL,
                 PRIMARY_TEXT_START "Save the capture file before merging to another one?" PRIMARY_TEXT_END "\n\n"
@@ -1051,7 +1051,7 @@ void
 file_close_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) {
   gpointer  dialog;
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before closing it?" PRIMARY_TEXT_END "\n\n"
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 7d13efcf64..d675360ab8 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
 /* gui_prefs.c
  * Dialog box for GUI preferences
  *
- * $Id: gui_prefs.c,v 1.73 2004/06/17 16:44:46 ulfl Exp $
+ * $Id: gui_prefs.c,v 1.74 2004/06/20 15:57:10 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -73,6 +73,7 @@ static gint recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_,
 #define GUI_FILEOPEN_KEY	"fileopen_behavior"
 #define GUI_RECENT_FILES_COUNT_KEY "recent_files_count"
 #define GUI_FILEOPEN_DIR_KEY	"fileopen_directory"
+#define GUI_ASK_UNSAVED_KEY     "ask_unsaved"
 
 #define GUI_TOOLBAR_STYLE_KEY	"toolbar_style"
 
@@ -178,7 +179,7 @@ gui_prefs_show(void)
 #endif
 	GtkWidget *fileopen_rb, *fileopen_dir_te, *toolbar_style_om;
     GtkWidget *filter_toolbar_placement_om;
-	GtkWidget *recent_files_count_max_te;
+	GtkWidget *recent_files_count_max_te, *ask_unsaved_cb;
 	GtkWidget *save_position_cb, *save_size_cb, *save_maximized_cb;
 #if GTK_MAJOR_VERSION < 2
 	GtkWidget *expander_style_om, *line_style_om;
@@ -311,6 +312,11 @@ gui_prefs_show(void)
 
 	fileopen_selected_cb(NULL, main_vb);        
 
+	ask_unsaved_cb = create_preference_check_button(main_tb, pos++,
+	    "Ask for unsaved capture files:", NULL, prefs.gui_ask_unsaved);
+	OBJECT_SET_DATA(main_vb, GUI_ASK_UNSAVED_KEY, ask_unsaved_cb);
+
+
 	/* Show 'em what we got */
 	gtk_widget_show_all(main_vb);
 
@@ -408,6 +414,9 @@ gui_prefs_fetch(GtkWidget *w)
 	prefs.gui_fileopen_dir = g_strdup(gtk_entry_get_text(
 		GTK_ENTRY(OBJECT_GET_DATA(w, GUI_FILEOPEN_DIR_KEY))));
 
+    prefs.gui_ask_unsaved = 
+	    gtk_toggle_button_get_active(OBJECT_GET_DATA(w, GUI_ASK_UNSAVED_KEY));
+
 	/*
 	 * XXX - we need to have a way to fetch the preferences into
 	 * local storage and only set the permanent preferences if there
diff --git a/gtk/main.c b/gtk/main.c
index 7b99c1b358..7ec18601f9 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.444 2004/06/20 14:48:24 ulfl Exp $
+ * $Id: main.c,v 1.445 2004/06/20 15:57:11 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -828,7 +828,7 @@ main_window_delete_event_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer
 {
   gpointer dialog;
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n"
@@ -922,7 +922,7 @@ file_quit_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 {
   gpointer dialog;
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n"
@@ -1360,7 +1360,7 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_)
         g_free(cf_name_ori);
 
         /* ask the user to save it's current capture file first */
-        if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+        if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
             /* user didn't saved his current file, ask him */
             dialog = simple_dialog(ESD_TYPE_CONFIRMATION,
                         ESD_BTNS_YES_NO_CANCEL,
diff --git a/gtk/menu.c b/gtk/menu.c
index 808e109b80..689dde0735 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.202 2004/06/17 21:53:26 ulfl Exp $
+ * $Id: menu.c,v 1.203 2004/06/20 15:57:11 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -976,7 +976,7 @@ menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   gpointer  dialog;
 
 
-  if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
     /* user didn't saved his current file, ask him */
     dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"