2006-01-14 [paul] 1.9.100cvs148
authorPaul Mangan <paul@claws-mail.org>
Sat, 14 Jan 2006 09:45:39 +0000 (09:45 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 14 Jan 2006 09:45:39 +0000 (09:45 +0000)
* src/account.c
* src/addressadd.c
* src/addressbook.c
* src/compose.c
* src/editaddress.c
* src/editbook.c
* src/editgroup.c
* src/editjpilot.c
* src/editldap.c
* src/editvcard.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/folderview.c
* src/grouplistdialog.c
* src/imap_gtk.c
* src/importmutt.c
* src/importpine.c
* src/inc.c
* src/main.c
* src/mainwindow.c
* src/message_search.c
* src/messageview.c
* src/mh_gtk.c
* src/mimeview.c
* src/news_gtk.c
* src/prefs_actions.c
* src/prefs_customheader.c
* src/prefs_filtering.c
* src/prefs_matcher.c
* src/prefs_template.c
* src/prefs_themes.c
* src/ssl_manager.c
* src/summary_search.c
* src/summaryview.c
* src/textview.c
* src/toolbar.c
* src/gtk/foldersort.c
* src/gtk/gtkaspell.c
* src/gtk/inputdialog.c
* src/gtk/prefswindow.c
* src/plugins/pgpcore/select-keys.c
* src/plugins/trayicon/trayicon.c
HIG compliant button order

45 files changed:
ChangeLog
PATCHSETS
configure.ac
src/account.c
src/addressadd.c
src/addressbook.c
src/compose.c
src/editaddress.c
src/editbook.c
src/editgroup.c
src/editjpilot.c
src/editldap.c
src/editvcard.c
src/exphtmldlg.c
src/expldifdlg.c
src/folderview.c
src/grouplistdialog.c
src/gtk/foldersort.c
src/gtk/gtkaspell.c
src/gtk/inputdialog.c
src/gtk/prefswindow.c
src/imap_gtk.c
src/importmutt.c
src/importpine.c
src/inc.c
src/main.c
src/mainwindow.c
src/message_search.c
src/messageview.c
src/mh_gtk.c
src/mimeview.c
src/news_gtk.c
src/plugins/pgpcore/select-keys.c
src/plugins/trayicon/trayicon.c
src/prefs_actions.c
src/prefs_customheader.c
src/prefs_filtering.c
src/prefs_matcher.c
src/prefs_template.c
src/prefs_themes.c
src/ssl_manager.c
src/summary_search.c
src/summaryview.c
src/textview.c
src/toolbar.c

index b09bd93..6358b62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2006-01-14 [paul]      1.9.100cvs148
+
+       * src/account.c
+       * src/addressadd.c
+       * src/addressbook.c
+       * src/compose.c
+       * src/editaddress.c
+       * src/editbook.c
+       * src/editgroup.c
+       * src/editjpilot.c
+       * src/editldap.c
+       * src/editvcard.c
+       * src/exphtmldlg.c
+       * src/expldifdlg.c
+       * src/folderview.c
+       * src/grouplistdialog.c
+       * src/imap_gtk.c
+       * src/importmutt.c
+       * src/importpine.c
+       * src/inc.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/message_search.c
+       * src/messageview.c
+       * src/mh_gtk.c
+       * src/mimeview.c
+       * src/news_gtk.c
+       * src/prefs_actions.c
+       * src/prefs_customheader.c
+       * src/prefs_filtering.c
+       * src/prefs_matcher.c
+       * src/prefs_template.c
+       * src/prefs_themes.c
+       * src/ssl_manager.c
+       * src/summary_search.c
+       * src/summaryview.c
+       * src/textview.c
+       * src/toolbar.c
+       * src/gtk/foldersort.c
+       * src/gtk/gtkaspell.c
+       * src/gtk/inputdialog.c
+       * src/gtk/prefswindow.c
+       * src/plugins/pgpcore/select-keys.c
+       * src/plugins/trayicon/trayicon.c
+               HIG compliant button order
+
 2006-01-14 [mones]     1.9.100cvs147
 
        * po/es.po
index a6d653b..d806eb7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/gtk/quicksearch.c;  ) > 1.9.100cvs145.patchset
 ( cvs diff -u -r 1.100.2.32 -r 1.100.2.33 AUTHORS;  cvs diff -u -r 1.396.2.193 -r 1.396.2.194 ChangeLog;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/authors.h;  ) > 1.9.100cvs146.patchset
 ( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 po/es.po;  ) > 1.9.100cvs147.patchset
+( cvs diff -u -r 1.61.2.42 -r 1.61.2.43 src/account.c;  cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/addressadd.c;  cvs diff -u -r 1.60.2.42 -r 1.60.2.43 src/addressbook.c;  cvs diff -u -r 1.382.2.220 -r 1.382.2.221 src/compose.c;  cvs diff -u -r 1.14.2.13 -r 1.14.2.14 src/editaddress.c;  cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/editbook.c;  cvs diff -u -r 1.11.2.9 -r 1.11.2.10 src/editgroup.c;  cvs diff -u -r 1.5.12.8 -r 1.5.12.9 src/editjpilot.c;  cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/editldap.c;  cvs diff -u -r 1.5.12.7 -r 1.5.12.8 src/editvcard.c;  cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/expldifdlg.c;  cvs diff -u -r 1.207.2.82 -r 1.207.2.83 src/folderview.c;  cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/grouplistdialog.c;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/imap_gtk.c;  cvs diff -u -r 1.4.12.10 -r 1.4.12.11 src/importmutt.c;  cvs diff -u -r 1.1.14.10 -r 1.1.14.11 src/importpine.c;  cvs diff -u -r 1.149.2.40 -r 1.149.2.41 src/inc.c;  cvs diff -u -r 1.115.2.72 -r 1.115.2.73 src/main.c;  cvs diff -u -r 1.274.2.88 -r 1.274.2.89 src/mainwindow.c;  cvs diff -u -r 1.3.12.12 -r 1.3.12.13 src/message_search.c;  cvs diff -u -r 1.94.2.74 -r 1.94.2.75 src/messageview.c;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/mh_gtk.c;  cvs diff -u -r 1.83.2.57 -r 1.83.2.58 src/mimeview.c;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/news_gtk.c;  cvs diff -u -r 1.60.2.29 -r 1.60.2.30 src/prefs_actions.c;  cvs diff -u -r 1.16.2.16 -r 1.16.2.17 src/prefs_customheader.c;  cvs diff -u -r 1.59.2.29 -r 1.59.2.30 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.31 -r 1.43.2.32 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/prefs_template.c;  cvs diff -u -r 1.3.2.36 -r 1.3.2.37 src/prefs_themes.c;  cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/ssl_manager.c;  cvs diff -u -r 1.15.2.19 -r 1.15.2.20 src/summary_search.c;  cvs diff -u -r 1.395.2.155 -r 1.395.2.156 src/summaryview.c;  cvs diff -u -r 1.96.2.89 -r 1.96.2.90 src/textview.c;  cvs diff -u -r 1.43.2.36 -r 1.43.2.37 src/toolbar.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/foldersort.c;  cvs diff -u -r 1.9.2.34 -r 1.9.2.35 src/gtk/gtkaspell.c;  cvs diff -u -r 1.2.2.14 -r 1.2.2.15 src/gtk/inputdialog.c;  cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/gtk/prefswindow.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs148.patchset
index fa1501c..9371f5f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=147
+EXTRA_VERSION=148
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 146eb9d..797af28 100644 (file)
@@ -977,8 +977,8 @@ static void account_delete(GtkWidget *widget, gpointer data)
                   ac_prefs->account_name ? ac_prefs->account_name :
                   _("(Untitled)"));
        if (alertpanel_full(_("Delete account"), buf,
-                           GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                           NULL, ALERT_WARNING, G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                           GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                           NULL, ALERT_WARNING, G_ALERTDEFAULT) != G_ALERTALTERNATE)
                return;
 
        if (ac_prefs->folder) {
index b130386..0fc4baa 100644 (file)
@@ -240,8 +240,8 @@ static void addressadd_create( void ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
index 6cb7b5c..85a6061 100644 (file)
@@ -1197,8 +1197,8 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        /* Confirm deletion */
        aval = alertpanel( _("Delete address(es)"),
                        _("Really delete the address(es)?"),
-                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
-       if( aval != G_ALERTDEFAULT ) return;
+                       GTK_STOCK_NO, GTK_STOCK_YES, NULL );
+       if( aval != G_ALERTALTERNATE ) return;
 
        /* Process deletions */
        if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
@@ -2530,9 +2530,9 @@ static void addressbook_treenode_delete_cb(
                                "results and addresses in '%s' ?" ),
                                obj->name );
                        aval = alertpanel( _("Delete"), message,
-                               GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+                               GTK_STOCK_NO, GTK_STOCK_YES, NULL );
                        g_free(message);
-                       if( aval == G_ALERTDEFAULT ) {
+                       if( aval == G_ALERTALTERNATE ) {
                                delType = ADDRTREE_DEL_FOLDER_ADDR;
                        }
                }
@@ -2555,9 +2555,9 @@ static void addressbook_treenode_delete_cb(
        }
        else {
                message = g_strdup_printf(_("Really delete '%s' ?"), obj->name);
-               aval = alertpanel(_("Delete"), message, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_NO, GTK_STOCK_YES, NULL);
                g_free(message);
-               if( aval == G_ALERTDEFAULT ) delType = ADDRTREE_DEL_DATA;
+               if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
        }
        if( delType == ADDRTREE_DEL_NONE ) return;
 
index c21f303..39253d7 100644 (file)
@@ -3674,8 +3674,8 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
                        AlertValue aval;
                        aval = alertpanel(_("Send"),
                                          _("The only recipient is the default CC address. Send anyway?"),
-                                         GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-                       if (aval != G_ALERTDEFAULT)
+                                         GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                       if (aval != G_ALERTALTERNATE)
                                return FALSE;
                }
        }
@@ -3702,8 +3702,8 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
                        AlertValue aval;
                        aval = alertpanel(_("Send"),
                                          _("The only recipient is the default BCC address. Send anyway?"),
-                                         GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-                       if (aval != G_ALERTDEFAULT)
+                                         GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                       if (aval != G_ALERTALTERNATE)
                                return FALSE;
                }
        }
@@ -3729,8 +3729,8 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
 
                aval = alertpanel(_("Send"),
                                  _("Subject is empty. Send it anyway?"),
-                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (aval != G_ALERTDEFAULT)
+                                 GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (aval != G_ALERTALTERNATE)
                        return FALSE;
        }
 
@@ -4124,11 +4124,11 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
                                msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
                                                        "to the specified %s charset.\n"
                                                        "Send it as %s?"), out_codeset, src_codeset);
-                               aval = alertpanel_full(_("Error"), msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                                                     NULL, ALERT_ERROR, G_ALERTALTERNATE);
+                               aval = alertpanel_full(_("Error"), msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                                                     NULL, ALERT_ERROR, G_ALERTDEFAULT);
                                g_free(msg);
 
-                               if (aval != G_ALERTDEFAULT) {
+                               if (aval != G_ALERTALTERNATE) {
                                        g_free(chars);
                                        return -3;
                                } else {
@@ -4178,9 +4178,9 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
                           "The contents of the message might be broken on the way to the delivery.\n"
                           "\n"
                           "Send it anyway?"), line + 1);
-               aval = alertpanel(_("Warning"), msg, GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+               aval = alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
                g_free(msg);
-               if (aval != G_ALERTDEFAULT) {
+               if (aval != G_ALERTALTERNATE) {
                        return -1;
                }
        }
@@ -6491,8 +6491,8 @@ static void compose_attach_property_create(gboolean *cancelled)
        SET_LABEL_AND_ENTRY(_("Path"),      path_entry,     2);
        SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
 
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
@@ -6676,12 +6676,12 @@ static gboolean compose_ext_editor_kill(Compose *compose)
                        (_("The external editor is still working.\n"
                           "Force terminating the process?\n"
                           "process group id: %d"), -pgid);
-               val = alertpanel_full(_("Notice"), msg, GTK_STOCK_YES, GTK_STOCK_NO,
-                                     NULL, FALSE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
+               val = alertpanel_full(_("Notice"), msg, GTK_STOCK_NO, GTK_STOCK_YES,
+                                     NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
                        
                g_free(msg);
 
-               if (val == G_ALERTDEFAULT) {
+               if (val == G_ALERTALTERNATE) {
                        g_source_remove(compose->exteditor_tag);
                        g_io_channel_shutdown(compose->exteditor_ch,
                                              FALSE, NULL);
index 2a4349b..de33900 100644 (file)
@@ -593,8 +593,8 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
index b5a4a42..c60dc90 100644 (file)
@@ -202,8 +202,8 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
index 39646e4..883ac8e 100644 (file)
@@ -388,8 +388,8 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
index 5b4a76d..c59f462 100644 (file)
@@ -316,8 +316,8 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
index 8749277..d5b834a 100644 (file)
@@ -339,8 +339,8 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
index 1629f95..41fd60f 100644 (file)
@@ -209,8 +209,8 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
index 29e5fd3..10d1178 100644 (file)
@@ -184,9 +184,9 @@ static gboolean exp_html_move_file( void ) {
                "does not exist. OK to create new directory?" ),
                _exportCtl_->dirOutput );
        aval = alertpanel( _("Create Directory" ),
-               msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+               msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL );
        g_free( msg );
-       if( aval != G_ALERTDEFAULT ) return FALSE;
+       if( aval != G_ALERTALTERNATE ) return FALSE;
 
        /* Create directory */
        if( ! exporthtml_create_dir( _exportCtl_ ) ) {
index 3c27e27..4e56615 100644 (file)
@@ -191,9 +191,9 @@ static gboolean exp_ldif_move_file( void ) {
                "does not exist. OK to create new directory?" ),
                _exportCtl_->dirOutput );
        aval = alertpanel( _("Create Directory" ),
-               msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+               msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL );
        g_free( msg );
-       if( aval != G_ALERTDEFAULT ) return FALSE;
+       if( aval != G_ALERTALTERNATE ) return FALSE;
 
        /* Create directory */
        if( ! exportldif_create_dir( _exportCtl_ ) ) {
@@ -250,8 +250,8 @@ static gboolean exp_ldif_move_dn( void ) {
                                "for an LDAP server. Are you sure you wish " \
                                "to proceed without a suffix?"
                         ),
-                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
-               if( aval != G_ALERTDEFAULT ) {
+                       GTK_STOCK_NO, GTK_STOCK_YES, NULL );
+               if( aval != G_ALERTALTERNATE ) {
                        gtk_widget_grab_focus( expldif_dlg.entrySuffix );
                        errFlag = TRUE;
                }
index 272744a..205cc64 100644 (file)
@@ -715,13 +715,13 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
        if (prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
-                         "folder as read ?"), GTK_STOCK_YES, GTK_STOCK_NO, NULL,
-                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+                         "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
 
-               if (val == G_ALERTALTERNATE ||
-                   val == (G_ALERTALTERNATE|G_ALERTDISABLE))
+               if (val == G_ALERTDEFAULT ||
+                   val == (G_ALERTDEFAULT|G_ALERTDISABLE))
                        return;
-               else if (val == (G_ALERTDEFAULT|G_ALERTDISABLE)) 
+               else if (val == (G_ALERTALTERNATE|G_ALERTDISABLE))
                        prefs_common.ask_mark_all_read = FALSE;
        }
        
@@ -962,9 +962,9 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
            alertpanel_full(_("Rebuild folder tree"), 
                         _("Rebuilding the folder tree will remove "
                           "local caches. Do you want to continue?"),
-                        GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                        NULL, ALERT_WARNING, G_ALERTALTERNATE
-               != G_ALERTDEFAULT) {
+                        GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                        NULL, ALERT_WARNING, G_ALERTDEFAULT
+               != G_ALERTALTERNATE) {
                return;
        }
 
@@ -2053,7 +2053,7 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        if (prefs_common.ask_on_clean) {
                if (alertpanel(_("Empty trash"),
                               _("Delete all messages in trash?"),
-                              GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                              GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
                        return;
        }
        
@@ -2138,12 +2138,12 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                        "sub-folder of '%s' ?"), from_folder->name,
                                        to_folder->name);
                status = alertpanel_full(_("Move folder"), buf,
-                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL, TRUE,
-                                        NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
+                                        NULL, ALERT_QUESTION, G_ALERTDEFAULT);
                g_free(buf);
 
-               if (status != G_ALERTDEFAULT
-                && status != (G_ALERTDEFAULT | G_ALERTDISABLE))
+               if (status != G_ALERTALTERNATE
+                && status != (G_ALERTALTERNATE | G_ALERTDISABLE))
                        return;
                if (status & G_ALERTDISABLE)
                        prefs_common.warn_dnd = FALSE;
index 5db545e..567473f 100644 (file)
@@ -237,9 +237,9 @@ static void grouplist_dialog_create(void)
        gtk_box_pack_start(GTK_BOX(hbox), status_label, FALSE, FALSE, 0);
 
        gtkut_stock_button_set_create(&confirm_area,
-                                     &ok_button, GTK_STOCK_OK,
+                                     &refresh_button, GTK_STOCK_REFRESH,
                                      &cancel_button, GTK_STOCK_CANCEL,
-                                     &refresh_button, GTK_STOCK_REFRESH);
+                                     &ok_button, GTK_STOCK_OK);
        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
                          confirm_area);
        gtk_widget_grab_default(ok_button);
index 36307de..53866ff 100644 (file)
@@ -147,8 +147,8 @@ void foldersort_open()
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_widget_show(confirm_area);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
index 68d9471..0d3d877 100644 (file)
@@ -1556,8 +1556,8 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
        hbox = gtk_hbox_new(TRUE, 0);
 
        gtkut_stock_button_set_create(&confirm_area,
-                                     &ok_button, GTK_STOCK_OK,
                                      &cancel_button, GTK_STOCK_CANCEL,
+                                     &ok_button, GTK_STOCK_OK,
                                      NULL, NULL);
 
        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
index a3569d8..5c3d49d 100644 (file)
@@ -253,8 +253,8 @@ static void input_dialog_create(gboolean is_password)
        hbox = gtk_hbox_new(TRUE, 0);
 
        gtkut_stock_button_set_create(&confirm_area,
-                                     &ok_button, GTK_STOCK_OK,
                                      &cancel_button, GTK_STOCK_CANCEL,
+                                     &ok_button, GTK_STOCK_OK,
                                      NULL, NULL);
 
        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
index a35d737..b4b3b04 100644 (file)
@@ -416,9 +416,9 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, gpointer dat
        gtk_widget_grab_focus(prefswindow->tree_view);
 
        gtkut_stock_button_set_create(&prefswindow->confirm_area,
-                                     &prefswindow->ok_btn,     GTK_STOCK_OK,
+                                     &prefswindow->apply_btn,  GTK_STOCK_APPLY,
                                      &prefswindow->cancel_btn, GTK_STOCK_CANCEL,
-                                     &prefswindow->apply_btn,  GTK_STOCK_APPLY);
+                                     &prefswindow->ok_btn,     GTK_STOCK_OK);
 
        gtk_widget_show_all(prefswindow->confirm_area);
 
index 40d79df..d90ca29 100644 (file)
@@ -266,10 +266,10 @@ static void delete_folder_cb(FolderView *folderview, guint action,
                   "Recovery will not be possible.\n\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel_full(_("Delete folder"), message,
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                                NULL, ALERT_WARNING, G_ALERTALTERNATE);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                                NULL, ALERT_WARNING, G_ALERTDEFAULT);
        g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
+       if (avalue != G_ALERTALTERNATE) return;
 
        Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
index e4fdeea..00f79a7 100644 (file)
@@ -250,8 +250,8 @@ static void imp_mutt_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
index 63920f3..95e465c 100644 (file)
@@ -250,8 +250,8 @@ static void imp_pine_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
index 38dd58c..1c4d324 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1448,12 +1448,12 @@ gboolean inc_offline_should_override(void)
 
                answer = alertpanel(_("Offline warning"), 
                               tmp,
-                              GTK_STOCK_YES, GTK_STOCK_NO, _("On_ly once"));
+                              GTK_STOCK_NO, GTK_STOCK_YES, _("On_ly once"));
                g_free(tmp);
-               if (answer == G_ALERTDEFAULT) {
+               if (answer == G_ALERTALTERNATE) {
                        overridden_yes = time(NULL);
                        return TRUE;
-               } else if (answer == G_ALERTALTERNATE) {
+               } else if (answer == G_ALERTDEFAULT) {
                        overridden_no  = time(NULL);
                        return FALSE;
                } else {
index d9b573f..11e91c5 100644 (file)
@@ -261,7 +261,7 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        GtkWidget *window = NULL;
        if (alertpanel(_("Migration of configuration"),
                       message,
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
                return FALSE;
        
        window = label_window_create(_("Copying configuration..."));
@@ -882,8 +882,8 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        if (prefs_common.warn_queued_on_exit && get_queued_message_num() > 0) {
                if (alertpanel(_("Queued messages"),
                               _("Some unsent messages are queued. Exit now?"),
-                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL)
-                   != G_ALERTDEFAULT)
+                              GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
+                   != G_ALERTALTERNATE)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
index 785b8b7..f40711e 100644 (file)
@@ -1720,8 +1720,8 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
        if (confirm) {
                if (alertpanel(_("Empty trash"),
                               _("Delete all messages in trash folders?"),
-                              GTK_STOCK_YES, GTK_STOCK_NO, NULL)
-                   != G_ALERTDEFAULT)
+                              GTK_STOCK_NO, GTK_STOCK_YES, NULL)
+                   != G_ALERTALTERNATE)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
@@ -2541,8 +2541,8 @@ static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit Sylpheed-Claws?"),
-                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL)
-                   != G_ALERTDEFAULT)
+                              GTK_STOCK_CANCEL, GTK_STOCK_OK,  NULL)
+                   != G_ALERTALTERNATE)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
@@ -2694,7 +2694,7 @@ static void mainwindow_check_synchronise(MainWindow *mainwin, gboolean ask)
                
        if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
                        _("Do you want to synchronise your folders now?"),
-                       GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                       GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
                return;
 
        folder_synchronise(NULL);
index 6c9618c..8dc1cc2 100644 (file)
@@ -214,8 +214,8 @@ static void message_search_execute(gboolean backward)
                                "continue from beginning?");
 
                val = alertpanel(_("Search finished"), str,
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (G_ALERTDEFAULT == val) {
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (G_ALERTALTERNATE == val) {
                        manage_window_focus_in(search_window.window,
                                               NULL, NULL);
                        messageview_set_position(messageview,
index 62611b1..5722454 100644 (file)
@@ -1046,8 +1046,8 @@ void messageview_save_as(MessageView *messageview)
 
                aval = alertpanel(_("Overwrite"),
                                  _("Overwrite existing file?"),
-                                 GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
-               if (G_ALERTDEFAULT != aval) return;
+                                 GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
+               if (G_ALERTALTERNATE != aval) return;
        }
 
        src = procmsg_get_message_file(msginfo);
index 869da2c..538c59d 100644 (file)
@@ -177,10 +177,10 @@ static void delete_folder_cb(FolderView *folderview, guint action,
                   "Recovery will not be possible.\n\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel_full(_("Delete folder"), message,
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                                NULL, ALERT_WARNING, G_ALERTALTERNATE);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                                NULL, ALERT_WARNING, G_ALERTDEFAULT);
        g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
+       if (avalue != G_ALERTALTERNATE) return;
 
        Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
@@ -323,12 +323,12 @@ static void remove_mailbox_cb(FolderView *folderview, guint action,
                (_("Really remove the mailbox '%s' ?\n"
                   "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel_full(_("Remove mailbox"), message,
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                                NULL, ALERT_WARNING, G_ALERTALTERNATE);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                                NULL, ALERT_WARNING, G_ALERTDEFAULT);
                            
        g_free(message);
        g_free(name);
-       if (avalue != G_ALERTDEFAULT) return;
+       if (avalue != G_ALERTALTERNATE) return;
 
        folderview_unselect(folderview);
        summary_clear_all(folderview->summaryview);
index a815ff0..1eadce7 100644 (file)
@@ -1338,10 +1338,10 @@ static gboolean mimeview_write_part(const gchar *filename,
                res = g_strdup_printf(_("Overwrite existing file '%s'?"),
                                      tmp);
                g_free(tmp);
-               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK
-                                 GTK_STOCK_CANCEL, NULL);
+               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL
+                                 GTK_STOCK_OK, NULL);
                g_free(res);                                      
-               if (G_ALERTDEFAULT != aval) return FALSE;
+               if (G_ALERTALTERNATE != aval) return FALSE;
        }
 
        if (procmime_get_part(filename, partinfo) < 0) {
index 9d36178..92865a1 100644 (file)
@@ -200,11 +200,11 @@ static void unsubscribe_newsgroup_cb(FolderView *folderview, guint action,
        name = trim_string(item->path, 32);
        message = g_strdup_printf(_("Really unsubscribe newsgroup '%s'?"), name);
        avalue = alertpanel_full(_("Unsubscribe newsgroup"), message,
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                                NULL, ALERT_WARNING, G_ALERTALTERNATE);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                                NULL, ALERT_WARNING, G_ALERTDEFAULT);
        g_free(message);
        g_free(name);
-       if (avalue != G_ALERTDEFAULT) return;
+       if (avalue != G_ALERTALTERNATE) return;
 
        if (folderview->opened == folderview->selected) {
                summary_clear_all(folderview->summaryview);
index d92854b..b92a404 100644 (file)
@@ -521,8 +521,8 @@ use_untrusted (gpgme_key_t key)
               "If you choose to encrypt the message with this key you don't\n"
               "know for sure that it will go to the person you mean it to.\n"
               "Do you trust it enough to use it anyway?"),
-            GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-    if (aval == G_ALERTDEFAULT)
+            GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+    if (aval == G_ALERTALTERNATE)
        return TRUE;
     else
        return FALSE;
index a757d2e..65137e9 100644 (file)
@@ -367,7 +367,8 @@ static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit this program?"),
-                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL) != G_ALERTDEFAULT) {
+                              GTK_STOCK_CANCEL, GTK_STOCK_OK,
+                              NULL) != G_ALERTALTERNATE) {
                        return;
                }
                manage_window_focus_in(mainwin->window, NULL, NULL);
index c444497..6c47c20 100644 (file)
@@ -189,8 +189,8 @@ static void prefs_actions_create(MainWindow *mainwin)
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_widget_show(confirm_area);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -612,7 +612,7 @@ static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
 
        if (alertpanel(_("Delete action"),
                       _("Do you really want to delete this action?"),
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
                return;
 
        /* XXX: Here's the reason why we need to store the original 
@@ -730,7 +730,8 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
 {
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
+                                GTK_STOCK_NO, GTK_STOCK_YES,
+                                NULL) != G_ALERTALTERNATE) {
                return;
        }
        modified = FALSE;
@@ -749,7 +750,8 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
 
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
+                                GTK_STOCK_NO, GTK_STOCK_YES,
+                                NULL) != G_ALERTALTERNATE) {
                return;
        }
        modified = FALSE;
index 74c8d9f..9ec9478 100644 (file)
@@ -166,8 +166,8 @@ static void prefs_custom_header_create(void)
        gtk_widget_show (vbox);
        gtk_container_add (GTK_CONTAINER (window), vbox);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_widget_show (confirm_area);
        gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -544,7 +544,7 @@ static void prefs_custom_header_delete_cb(void)
 
        if (alertpanel(_("Delete header"),
                       _("Do you really want to delete this header?"),
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
                return;
 
        gtk_tree_model_get(model, &sel,
index 97e07f2..c002228 100644 (file)
@@ -232,8 +232,8 @@ static void prefs_filtering_create(void)
        gtk_widget_show (vbox);
        gtk_container_add (GTK_CONTAINER (window), vbox);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK, NULL, NULL);
        gtk_widget_show (confirm_area);
        gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default (ok_btn);
@@ -920,7 +920,7 @@ static void prefs_filtering_delete_cb(void)
 
        if (alertpanel(_("Delete rule"),
                       _("Do you really want to delete this rule?"),
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) == G_ALERTALTERNATE)
+                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) == G_ALERTDEFAULT)
                return;
 
        model = gtk_tree_view_get_model(list_view);     
@@ -1080,8 +1080,8 @@ static void prefs_filtering_ok(void)
                if (!filtering_str) {
                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-                       if (G_ALERTDEFAULT != val) {
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                       if (G_ALERTALTERNATE != val) {
                                g_free(filtering_str);
                                g_free(str); /* fixed two leaks: huzzah! */
                                filteringprop_free(prop);
@@ -1102,8 +1102,8 @@ static void prefs_filtering_ok(void)
                    strlen(action)) {
                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-                       if (G_ALERTDEFAULT != val) {
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                       if (G_ALERTALTERNATE != val) {
                                g_free(name);
                                g_free(condition);
                                g_free(action);
index 7694537..5ea058f 100644 (file)
@@ -400,8 +400,8 @@ static void prefs_matcher_create(void)
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK, NULL, NULL);
        gtk_widget_show(confirm_area);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
@@ -1635,8 +1635,8 @@ static void prefs_matcher_ok(void)
                                if (!matcher_str || strcmp(matcher_str, str) != 0) {
                                        val = alertpanel(_("Entry not saved"),
                                                         _("The entry was not saved.\nHave you really finished?"),
-                                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-                                       if (G_ALERTDEFAULT != val) {
+                                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                                       if (G_ALERTALTERNATE != val) {
                                                g_free(matcher_str);                                             
                                                g_free(str);
                                                return;
index 4ccb93d..8cf3a77 100644 (file)
@@ -286,8 +286,8 @@ static void prefs_template_window_create(void)
        gtk_container_add(GTK_CONTAINER(scroll1), list_view);
 
        /* ok | cancel */
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                               &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK, NULL, NULL);
        gtk_widget_show(confirm_area);
        gtk_box_pack_end(GTK_BOX(vbox2), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
@@ -397,7 +397,8 @@ static void prefs_template_ok_cb(void)
 
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
+                                GTK_STOCK_NO, GTK_STOCK_YES,
+                                NULL) != G_ALERTALTERNATE) {
                return;
        }
        modified = FALSE;
@@ -413,7 +414,8 @@ static void prefs_template_cancel_cb(void)
 {
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT) {
+                                GTK_STOCK_NO, GTK_STOCK_YES,
+                                NULL) != G_ALERTALTERNATE) {
                return;
        }
        modified = FALSE;
@@ -603,7 +605,8 @@ static void prefs_template_delete_cb(void)
 
        if (alertpanel(_("Delete template"),
                       _("Do you really want to delete this template?"),
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_NO, GTK_STOCK_YES,
+                      NULL) != G_ALERTALTERNATE)
                return;
 
        gtk_list_store_remove(GTK_LIST_STORE(model), &row);             
index 7c9b836..9b29d41 100644 (file)
@@ -460,10 +460,10 @@ static void prefs_themes_btn_remove_clicked_cb(GtkWidget *widget, gpointer data)
 
        val = alertpanel(alert_title,
                         _("Are you sure you want to remove this theme?"),
-                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                        GTK_STOCK_NO, GTK_STOCK_YES, NULL);
        g_free(alert_title);
 
-       if (G_ALERTDEFAULT == val) {
+       if (G_ALERTALTERNATE == val) {
                gchar *status = NULL;
                
                prefs_themes_foreach_file(theme_str, prefs_themes_file_remove, &status); 
@@ -515,21 +515,21 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
        if (file_exist(themeinfo, FALSE) == FALSE) {
                val = alertpanel(alert_title,
                                 _("This folder doesn't seem to be a theme folder.\nInstall anyway?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (G_ALERTDEFAULT != val)
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (G_ALERTALTERNATE != val)
                        goto end_inst;
        }
        if (getuid() == 0) {
                val = alertpanel(alert_title,
                                 _("Do you want to install theme for all users?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
                switch (val) {
-               case G_ALERTDEFAULT:
+               case G_ALERTALTERNATE:
                        cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
                                                  PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S, 
                                                  themename, NULL);
                        break;
-               case G_ALERTALTERNATE:
+               case G_ALERTDEFAULT:
                        break;
                default:
                        goto end_inst;
index 273ef03..4d170a9 100644 (file)
@@ -373,11 +373,11 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
 
        val = alertpanel_full(_("Delete certificate"),
                              _("Do you really want to delete this certificate?"),
-                             GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                             NULL, ALERT_WARNING, G_ALERTALTERNATE);
+                             GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                             NULL, ALERT_WARNING, G_ALERTDEFAULT);
 
                             
-       if (val != G_ALERTDEFAULT)
+       if (val != G_ALERTALTERNATE)
                return;
        
        ssl_certificate_delete_from_disk(cert);
index 75720da..e7ea3e6 100644 (file)
@@ -387,8 +387,8 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                                str = _("End of list reached; continue from beginning?");
 
                        val = alertpanel(_("Search finished"), str,
-                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-                       if (G_ALERTDEFAULT == val) {
+                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                       if (G_ALERTALTERNATE == val) {
                                if (backward)
                                        node = GTK_CTREE_NODE
                                                (GTK_CLIST(ctree)->row_list_end);
index a309165..7dce2ac 100644 (file)
@@ -849,13 +849,13 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
                val = alertpanel(_("Process mark"),
                                 _("Some marks are left. Process it?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
-               if (G_ALERTDEFAULT == val) {
+                                GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL);
+               if (G_ALERTALTERNATE == val) {
                        summary_unlock(summaryview);
                        summary_execute(summaryview);
                        summary_lock(summaryview);
                        changed = TRUE;
-               } else if (G_ALERTALTERNATE == val) {
+               } else if (G_ALERTDEFAULT == val) {
                        /* DO NOTHING */
                } else {
                        summary_unlock(summaryview);
@@ -1297,19 +1297,19 @@ void summary_select_prev_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Search from the end?"),
-                                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                               val = G_ALERTDEFAULT;
+                               val = G_ALERTALTERNATE;
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                               val = !G_ALERTDEFAULT;
+                               val = !G_ALERTALTERNATE;
                                break;
                        default:
                                debug_print(
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
-               if (val != G_ALERTDEFAULT) return;
+               if (val != G_ALERTALTERNATE) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_UNREAD, FALSE);
        }
@@ -1349,10 +1349,10 @@ void summary_select_next_unread(SummaryView *summaryview)
                                        val = alertpanel(_("No more unread messages"),
                                                         _("No unread message found. "
                                                           "Go to next folder?"),
-                                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL);
                                        break;
                                case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                                       val = G_ALERTDEFAULT;
+                                       val = G_ALERTALTERNATE;
                                        break;
                                case NEXTUNREADMSGDIALOG_ASSUME_NO:
                                        val = G_ALERTOTHER;
@@ -1362,7 +1362,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                                                _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                        }
 
-                       if (val == G_ALERTDEFAULT) {
+                       if (val == G_ALERTALTERNATE) {
                                folderview_select_next_unread(summaryview->folderview);
                                return;
                        } 
@@ -1396,19 +1396,19 @@ void summary_select_prev_new(SummaryView *summaryview)
                                val = alertpanel(_("No more new messages"),
                                                 _("No new message found. "
                                                   "Search from the end?"),
-                                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                               val = G_ALERTDEFAULT;
+                               val = G_ALERTALTERNATE;
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                               val = !G_ALERTDEFAULT;
+                               val = !G_ALERTALTERNATE;
                                break;
                        default:
                                debug_print(
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
-               if (val != G_ALERTDEFAULT) return;
+               if (val != G_ALERTALTERNATE) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_NEW, FALSE);
        }
@@ -1448,10 +1448,10 @@ void summary_select_next_new(SummaryView *summaryview)
                                        val = alertpanel(_("No more new messages"),
                                                         _("No new message found. "
                                                           "Go to next folder?"),
-                                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL);
                                        break;
                                case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                                       val = G_ALERTDEFAULT;
+                                       val = G_ALERTALTERNATE;
                                        break;
                                case NEXTUNREADMSGDIALOG_ASSUME_NO:
                                        val = G_ALERTOTHER;
@@ -1461,7 +1461,7 @@ void summary_select_next_new(SummaryView *summaryview)
                                                _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                        }
 
-                       if (val == G_ALERTDEFAULT) {
+                       if (val == G_ALERTALTERNATE) {
                                folderview_select_next_new(summaryview->folderview);
                                return;
                        } 
@@ -1486,8 +1486,8 @@ void summary_select_prev_marked(SummaryView *summaryview)
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
                                   "Search from the end?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (val != G_ALERTDEFAULT) return;
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (val != G_ALERTALTERNATE) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_MARKED, TRUE);
        }
@@ -1511,8 +1511,8 @@ void summary_select_next_marked(SummaryView *summaryview)
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
                                   "Search from the beginning?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (val != G_ALERTDEFAULT) return;
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (val != G_ALERTALTERNATE) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                     MSG_MARKED, TRUE);
        }
@@ -1536,8 +1536,8 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
                                   "Search from the end?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (val != G_ALERTDEFAULT) return;
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (val != G_ALERTALTERNATE) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_CLABEL_FLAG_MASK, TRUE);
        }
@@ -1561,8 +1561,8 @@ void summary_select_next_labeled(SummaryView *summaryview)
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
                                   "Search from the beginning?"),
-                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (val != G_ALERTDEFAULT) return;
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+               if (val != G_ALERTALTERNATE) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                     MSG_CLABEL_FLAG_MASK, TRUE);
        }
@@ -3277,8 +3277,8 @@ void summary_delete(SummaryView *summaryview)
 
        aval = alertpanel(_("Delete message(s)"),
                          _("Do you really want to delete selected message(s)?"),
-                         GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-       if (aval != G_ALERTDEFAULT) return;
+                         GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+       if (aval != G_ALERTALTERNATE) return;
 
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
             cur = cur->next) {
index 7c34000..5c8c2d8 100644 (file)
@@ -2036,10 +2036,10 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
                                        "Open it anyway?"),
                                      uri->uri, visible_str);
                aval = alertpanel_full(_("Fake URL warning"), msg,
-                                      GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
-                                      NULL, ALERT_WARNING, G_ALERTALTERNATE);
+                                      GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
+                                      NULL, ALERT_WARNING, G_ALERTDEFAULT);
                g_free(msg);
-               if (aval == G_ALERTDEFAULT)
+               if (aval == G_ALERTALTERNATE)
                        retval = TRUE;
        }
 
@@ -2177,10 +2177,10 @@ static void save_file_cb (TextView *textview, guint action, void *data)
                
                res = g_strdup_printf(_("Overwrite existing file '%s'?"),
                                      filename);
-               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK
-                                 GTK_STOCK_CANCEL, NULL);
+               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL
+                                 GTK_STOCK_OK, NULL);
                g_free(res);                                      
-               if (G_ALERTDEFAULT != aval) 
+               if (G_ALERTALTERNATE != aval)
                        return;
        }
 
index a00585c..4facc16 100644 (file)
@@ -1971,7 +1971,8 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
        if (prefs_common.work_offline)
                if (alertpanel(_("Offline warning"), 
                               _("You're working offline. Override?"),
-                              GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                              GTK_STOCK_NO, GTK_STOCK_YES,
+                              NULL) != G_ALERTALTERNATE)
                return;
 
        /* ask for confirmation before sending queued messages only
@@ -1990,7 +1991,8 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
                if (found && !prefs_common.work_offline) {
                        if (alertpanel(_("Send queued messages"), 
                                   _("Send all queued messages?"),
-                                  GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                                  GTK_STOCK_NO, GTK_STOCK_YES,
+                                  NULL) != G_ALERTALTERNATE)
                                return;
                }
        }