Get rid of the "Question" alert box type - rename it to "Confirmation",

as that seems to be the name used in the GNOME HIG, at least.  Make it
use the Warning icon (that's what the GNOME HIG says - and it's also
what's used for the equivalent on Windows), and use it for the "Save
current capture?" alert boxes.

svn path=/trunk/; revision=10030

6 files changed, 21 insertions, 22 deletions

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 26f613ee01..c0b059f689 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.102 2004/02/04 01:10:36 guy Exp $
+ * $Id: capture_dlg.c,v 1.103 2004/02/11 03:55:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -785,7 +785,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
     /* user didn't saved his current file, ask him */
-    dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                 ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before starting a new capture?" PRIMARY_TEXT_END "\n\n"
                 "If you start a new capture without saving, your current capture data will be discarded.");
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index f998b6f2ca..d5dc9fc914 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.94 2004/02/11 00:55:27 guy Exp $
+ * $Id: file_dlg.c,v 1.95 2004/02/11 03:55:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -364,7 +364,7 @@ file_open_cmd_cb(GtkWidget *widget, gpointer data _U_) {
 
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
     /* user didn't saved his current file, ask him */
-    dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                 ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
                 "If you open a new capture file without saving, your capture data will be discarded.");
@@ -491,7 +491,7 @@ file_close_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) {
 
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
     /* user didn't saved his current file, ask him */
-    dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                 ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before closing it?" PRIMARY_TEXT_END "\n\n"
                 "If you close without saving, your capture data will be discarded.");
diff --git a/gtk/main.c b/gtk/main.c
index cfedb0e3cd..e6065c0b7d 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.392 2004/02/11 00:55:28 guy Exp $
+ * $Id: main.c,v 1.393 2004/02/11 03:55:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1211,7 +1211,7 @@ main_window_delete_event_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer
 
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
     /* user didn't saved his current file, ask him */
-    dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                 ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n"
                 "If you quit the program without saving, your capture data will be discarded.");
@@ -1333,7 +1333,7 @@ file_quit_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
 
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
     /* user didn't saved his current file, ask him */
-    dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                 ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n"
                 "If you quit the program without saving, your capture data will be discarded.");
@@ -1765,7 +1765,7 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_)
         /* ask the user to save it's current capture file first */
         if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
             /* user didn't saved his current file, ask him */
-            dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+            dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                         ESD_BTNS_YES_NO_CANCEL,
                         PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
                         "If you open a new capture file without saving, your current capture data will be discarded.");
diff --git a/gtk/menu.c b/gtk/menu.c
index 25c815568f..fce970053e 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.159 2004/02/04 20:46:20 guy Exp $
+ * $Id: menu.c,v 1.160 2004/02/11 03:55:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -839,7 +839,7 @@ menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
 
   if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
     /* user didn't saved his current file, ask him */
-    dialog = simple_dialog(ESD_TYPE_WARN | ESD_TYPE_MODAL, 
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, 
                 ESD_BTNS_YES_NO_CANCEL,
                 PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
                 "If you open a new capture file without saving, your current capture data will be discarded.");
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 0e760b5c9e..846d010ed9 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,7 +1,7 @@
 /* simple_dialog.c
  * Simple message dialog box routines.
  *
- * $Id: simple_dialog.c,v 1.25 2004/02/11 03:40:17 guy Exp $
+ * $Id: simple_dialog.c,v 1.26 2004/02/11 03:55:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,6 @@
 
 #include "image/stock_dialog_error_48.xpm"
 #include "image/stock_dialog_info_48.xpm"
-#include "image/stock_dialog_question_48.xpm"
 #include "image/stock_dialog_warning_48.xpm"
 
 static void simple_dialog_cancel_cb(GtkWidget *, gpointer);
@@ -78,8 +77,8 @@ simple_dialog(gint type, gint btn_mask, gchar *msg_format, ...) {
   case ESD_TYPE_WARN :
     icon = stock_dialog_warning_48_xpm;
     break;
-  case ESD_TYPE_QUESTION:
-    icon = stock_dialog_question_48_xpm;
+  case ESD_TYPE_CONFIRMATION:
+    icon = stock_dialog_warning_48_xpm;
     break;
   case ESD_TYPE_ERROR:
     icon = stock_dialog_error_48_xpm;
diff --git a/simple_dialog.h b/simple_dialog.h
index 5f06791435..3b44d5f6d9 100644
--- a/simple_dialog.h
+++ b/simple_dialog.h
@@ -2,7 +2,7 @@
  * Definitions for alert box routines with toolkit-independent APIs but
  * toolkit-dependent implementations.
  *
- * $Id: simple_dialog.h,v 1.9 2004/02/04 01:10:36 guy Exp $
+ * $Id: simple_dialog.h,v 1.10 2004/02/11 03:55:47 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,15 +37,15 @@ extern "C" {
 
    WARN: tells the user about a problem; the only button should be "OK"
 
-   QUESTION: asks the user for confirmation; there should be more than one
-   button
+   CONFIRMATION: asks the user for confirmation; there should be more than
+   one button
    
    ERROR: tells the user about a serious problem; the only button should be
    "OK". */
-#define ESD_TYPE_INFO	    0x00
-#define ESD_TYPE_WARN	    0x01
-#define ESD_TYPE_QUESTION   0x02
-#define ESD_TYPE_ERROR	    0x03
+#define ESD_TYPE_INFO	      0x00
+#define ESD_TYPE_WARN	      0x01
+#define ESD_TYPE_CONFIRMATION 0x02
+#define ESD_TYPE_ERROR	      0x03
 
 /* Flag to be ORed with the dialog type, to specify that the dialog is
    to be modal. */