Make dialog Cancel/OK to match HIG.

* message-tag-editor.c (message_tag_editor_init): Make dialog
Cancel/OK to match HIG.

* mail-signature-editor.c (do_exit): Make confirmation dialog
Discard/Cancel/Save to match the HIG.

* mail-composer-prefs.c (mail_composer_prefs_construct): Make
dialog Cancel/OK to match HIG.

* mail-account-editor.c (construct): Make the dialog
Apply/Close/OK to match HIG.

svn path=/trunk/; revision=19469

6 files changed, 29 insertions, 10 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e3ce6c3bc3..506f4338e5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-14  Ettore Perazzoli  <ettore@ximian.com>
+
+	* message-tag-editor.c (message_tag_editor_init): Make dialog
+	Cancel/OK to match HIG.
+
+	* mail-signature-editor.c (do_exit): Make confirmation dialog
+	Discard/Cancel/Save to match the HIG.
+
+	* mail-composer-prefs.c (mail_composer_prefs_construct): Make
+	dialog Cancel/OK to match HIG.
+
+	* mail-account-editor.c (construct): Make the dialog
+	Apply/Close/OK to match HIG.
+
 2003-01-14  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-account-gui.c (mail_account_gui_save): Call
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 88850f7584..848c1a7fd1 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -147,9 +147,9 @@ construct (MailAccountEditor *editor, MailConfigAccount *account, MailAccountsTa
 	gtk_window_set_policy (GTK_WINDOW (editor), FALSE, TRUE, TRUE);
 	gtk_window_set_modal (GTK_WINDOW (editor), FALSE);
 	gtk_dialog_add_buttons (GTK_DIALOG (editor),
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
+				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
 	
 	g_signal_connect (editor, "response", G_CALLBACK (editor_response_cb), editor);
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index dd86cfe39f..2ca3997e45 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -852,8 +852,10 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
 	/* Signatures */
 	dialog = (GtkDialog *) gtk_dialog_new ();
 	prefs->sig_script_dialog = (GtkWidget *) dialog;
-	gtk_dialog_add_buttons (dialog, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
+	gtk_dialog_add_buttons (dialog,
+				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+				NULL);
 	gtk_window_set_title ((GtkWindow *) dialog, _("Add script signature"));
 	g_signal_connect (dialog, "response", G_CALLBACK (sig_add_script_response), prefs);
 	widget = glade_xml_get_widget (prefs->sig_script_gui, "vbox_add_script_signature");
diff --git a/mail/mail-config.c b/mail/mail-config.c
index ae2391b8f8..11a567ab54 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1520,7 +1520,8 @@ mail_config_check_service (const char *url, CamelProviderType type, GList **auth
 	id = m->msg.seq;
 	e_thread_put(mail_thread_queued, (EMsg *)m);
 
-	dialog = gtk_dialog_new_with_buttons(_("Connecting to server..."), window, GTK_DIALOG_DESTROY_WITH_PARENT,
+	dialog = gtk_dialog_new_with_buttons(_("Connecting to server..."), window,
+					     GTK_DIALOG_DESTROY_WITH_PARENT,
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     NULL);
 	label = gtk_label_new (_("Connecting to server..."));
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index ce97e403fd..4691ff4f4c 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -174,7 +174,11 @@ do_exit (ESignatureEditor *editor)
 						GTK_BUTTONS_YES_NO,
 						_("This signature has been changed, but hasn't been saved.\n"
 						  "\nDo you wish to save your changes?"));
-		gtk_dialog_add_button((GtkDialog *)dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+		gtk_dialog_add_buttons ((GtkDialog *)dialog,
+					_("_Discard changes"), GTK_RESPONSE_NO,
+					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					GTK_STOCK_SAVE, GTK_RESPONSE_YES,
+					NULL);
 		gtk_window_set_title((GtkWindow *)dialog, _("Save signature"));
 		gtk_dialog_set_default_response((GtkDialog *)dialog, GTK_RESPONSE_YES);
 
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
index 7d7f6d420b..616bde1ecd 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -80,10 +80,8 @@ message_tag_editor_init (MessageTagEditor *editor)
 {
 	g_object_set (editor, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
 	gtk_dialog_add_buttons (GTK_DIALOG (editor),
-				GTK_STOCK_OK,
-				GTK_RESPONSE_OK,
-				GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL,
+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
 	
 	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);