2006-05-23 [colin] 2.2.0cvs49

	* src/folderview.c
	* src/imap.c
	* src/inc.c
	* src/mbox.c
	* src/messageview.c
	* src/news.c
	* src/send_message.c
	* src/summaryview.c
	* src/gtk/sslcertwindow.c
		alertpanel fixes, by Fabien

diff --git a/ChangeLog b/ChangeLog
index e68051d4711f342c54c1a5dc31723a4b6166b6b2..c67b76c1fdfac4080420af7aff9219e823d2d200 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-23 [colin]     2.2.0cvs49
+
+       * src/folderview.c
+       * src/imap.c
+       * src/inc.c
+       * src/mbox.c
+       * src/messageview.c
+       * src/news.c
+       * src/send_message.c
+       * src/summaryview.c
+       * src/gtk/sslcertwindow.c
+               alertpanel fixes, by Fabien
+
 2006-05-23 [colin]     2.2.0cvs48
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 691d51f10b038db982b5e39d3fbd27df6d6b4515..6f184ca4cc43107c038195fb25caef1734f612f7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1518,3 +1518,4 @@
 ( cvs diff -u -r 1.60.2.16 -r 1.60.2.17 src/filtering.c;  ) > 2.2.0cvs46.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/fr/advanced.xml;  ) > 2.2.0cvs47.patchset
 ( cvs diff -u -r 1.213.2.93 -r 1.213.2.94 src/folder.c;  cvs diff -u -r 1.207.2.98 -r 1.207.2.99 src/folderview.c;  cvs diff -u -r 1.79.2.28 -r 1.79.2.29 src/mh.c;  cvs diff -u -r 1.16.2.30 -r 1.16.2.31 src/msgcache.c;  cvs diff -u -r 1.395.2.204 -r 1.395.2.205 src/summaryview.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtksctree.h;  ) > 2.2.0cvs48.patchset
+( cvs diff -u -r 1.207.2.99 -r 1.207.2.100 src/folderview.c;  cvs diff -u -r 1.179.2.116 -r 1.179.2.117 src/imap.c;  cvs diff -u -r 1.149.2.48 -r 1.149.2.49 src/inc.c;  cvs diff -u -r 1.28.2.14 -r 1.28.2.15 src/mbox.c;  cvs diff -u -r 1.94.2.83 -r 1.94.2.84 src/messageview.c;  cvs diff -u -r 1.101.2.24 -r 1.101.2.25 src/news.c;  cvs diff -u -r 1.17.2.28 -r 1.17.2.29 src/send_message.c;  cvs diff -u -r 1.395.2.205 -r 1.395.2.206 src/summaryview.c;  cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/gtk/sslcertwindow.c;  ) > 2.2.0cvs49.patchset

diff --git a/configure.ac b/configure.ac
index 4d7fa35b1f5fd7624c680192b966e6b78c0b993b..0b064cbd773324f7e857fdeb287f1ca8ae55ba26 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 17b8fed6ae1dd6f61751947fd573de3424a16260..449bcde69eb97de6c48aaa956d57a49f16345a42 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -721,15 +721,14 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
                          "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
-                         TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
-               if (val == G_ALERTDEFAULT ||
-                   val == (G_ALERTDEFAULT|G_ALERTDISABLE))
+               if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
                        return;
-               else if (val == (G_ALERTALTERNATE|G_ALERTDISABLE))
+               else if (val & G_ALERTDISABLE)
                        prefs_common.ask_mark_all_read = FALSE;
        }
-       
+
        summary_lock(folderview->summaryview);
        folder_item_update_freeze();
        if (folderview->summaryview->folder_item == item)
@@ -2233,10 +2232,9 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                         NULL, ALERT_QUESTION, G_ALERTDEFAULT);
                g_free(buf);
 
-               if (status != G_ALERTALTERNATE
-                && status != (G_ALERTALTERNATE | G_ALERTDISABLE))
+               if ((status & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
                        return;
-               if (status & G_ALERTDISABLE)
+               else if (status & G_ALERTDISABLE)
                        prefs_common.warn_dnd = FALSE;
        }
 

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index a726405aebec1e63c9e5668100b35e74fa706c9d..386bca061b3fe6a83bd4f6dfe4ae46bb766cf386 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -290,10 +290,10 @@ gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
        gtk_container_add(GTK_CONTAINER(button), cert_widget);
 
        val = alertpanel_full(_("Unknown SSL Certificate"), NULL,
-                             _("_Accept and save"), _("_Cancel connection"), NULL,
+                             _("_Cancel connection"), _("_Accept and save"), NULL,
                              FALSE, vbox, ALERT_QUESTION, G_ALERTDEFAULT);
        
-       return (val == G_ALERTDEFAULT);
+       return (val == G_ALERTALTERNATE);
 }
 
 gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert)
@@ -330,10 +330,10 @@ gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert)
        gtk_container_add(GTK_CONTAINER(button), cert_widget);
 
        val = alertpanel_full(_("Expired SSL Certificate"), NULL,
-                             _("_Accept"), _("_Cancel connection"), NULL,
+                             _("_Cancel connection"), _("_Accept"), NULL,
                              FALSE, vbox, ALERT_QUESTION, G_ALERTDEFAULT);
        
-       return (val == G_ALERTDEFAULT);
+       return (val == G_ALERTALTERNATE);
 }
 
 gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate *new_cert)
@@ -383,9 +383,9 @@ gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate
        gtk_container_add(GTK_CONTAINER(button), vbox);
 
        val = alertpanel_full(_("Changed SSL Certificate"), NULL,
-                             _("_Accept and save"), _("_Cancel connection"), NULL,
+                             _("_Cancel connection"), _("_Accept and save"), NULL,
                              FALSE, vbox2, ALERT_WARNING, G_ALERTDEFAULT);
        
-       return (val == G_ALERTDEFAULT);
+       return (val == G_ALERTALTERNATE);
 }
 #endif

diff --git a/src/imap.c b/src/imap.c
index 0812f024908c13a7ea051e37e79d59e9a912089f..54e2f70ef674b034d1ac02abccec3ef657bf08f3 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -775,10 +775,9 @@ static IMAPSession *imap_session_new(Folder * folder,
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Con_tinue connecting"), 
-                         GTK_STOCK_CANCEL, NULL,
-                         FALSE, NULL, ALERT_WARNING,
-                         G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                         GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
+                         NULL, FALSE, NULL, ALERT_WARNING,
+                         G_ALERTDEFAULT) != G_ALERTALTERNATE)
                        return NULL;
        }
        port = account->set_imapport ? account->imapport

diff --git a/src/inc.c b/src/inc.c
index 938719a339bc997447573b9551e48f9db6fbb7d7..428156251b69e8641cfa248159fa939780f65560 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -761,10 +761,9 @@ static IncState inc_pop3_session_do(IncSession *session)
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Con_tinue connecting"), 
-                         GTK_STOCK_CANCEL, NULL,
-                         FALSE, NULL, ALERT_WARNING,
-                         G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                         GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
+                         NULL, FALSE, NULL, ALERT_WARNING,
+                         G_ALERTDEFAULT) != G_ALERTALTERNATE)
                        return INC_CANCEL;
        }
        port = pop3_session->ac_prefs->set_popport ?

diff --git a/src/mbox.c b/src/mbox.c
index 0bf12e5dce65841e79d21ee7c1dfe843b4ece963..21ed549508dfbe5ce8362859192a431aa2f291e6 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -386,12 +386,12 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
 
        if (g_file_test(mbox, G_FILE_TEST_EXISTS) == TRUE) {
                if (alertpanel_full(_("Overwrite mbox file"),
-                                                       _("This file already exists. Do you want to overwrite it?"),
-                                                       _("Overwrite"), GTK_STOCK_CANCEL, NULL, FALSE,
-                                                       NULL, ALERT_WARNING, G_ALERTALTERNATE)
-                       == G_ALERTALTERNATE) {
-               return -2;
-       }
+                                       _("This file already exists. Do you want to overwrite it?"),
+                                       GTK_STOCK_CANCEL, _("Overwrite"), NULL, FALSE,
+                                       NULL, ALERT_WARNING, G_ALERTDEFAULT)
+                               != G_ALERTALTERNATE) {
+                       return -2;
+               }
        }
 
        if ((mbox_fp = g_fopen(mbox, "wb")) == NULL) {

diff --git a/src/messageview.c b/src/messageview.c
index 2172d5b316127e44e6dbb3d2ebee3a53173a7109..691654b932b729d4124c2e0cd64c622809f87d35 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -563,11 +563,11 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                    "Return path: %s\n"
                    "It is advised to not to send the return receipt."),
                  to, buf);
-               val = alertpanel_full(_("Warning"), message, _("_Send"),
-                                       _("+_Don't Send"), NULL, FALSE,
-                                       NULL, ALERT_WARNING, G_ALERTALTERNATE);
+               val = alertpanel_full(_("Warning"), message,
+                               _("_Don't Send"), _("_Send"), NULL, FALSE,
+                               NULL, ALERT_WARNING, G_ALERTDEFAULT);
                g_free(message);                                
-               if (val != G_ALERTDEFAULT)
+               if (val != G_ALERTALTERNATE)
                        return -1;
        }
 
@@ -581,9 +581,9 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                    "but according to its 'To:' and 'CC:' headers it was not\n"
                    "officially addressed to you.\n"
                    "It is advised to not to send the return receipt."),
-                 _("_Send"), _("+_Don't Send"),NULL, FALSE,
-                 NULL, ALERT_WARNING, G_ALERTALTERNATE);
-               if (val != G_ALERTDEFAULT)
+                 _("_Don't Send"), _("_Send"), NULL, FALSE,
+                 NULL, ALERT_WARNING, G_ALERTDEFAULT);
+               if (val != G_ALERTALTERNATE)
                        return -1;
        }
 

diff --git a/src/news.c b/src/news.c
index 2ae1e13bb93c89873855d3475604830f46181a18..da2766a88de0c852ea517a5a2cd95f88ee497d4b 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -287,10 +287,9 @@ static Session *news_session_new_for_folder(Folder *folder)
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Con_tinue connecting"), 
-                         GTK_STOCK_CANCEL, NULL,
-                         FALSE, NULL, ALERT_WARNING,
-                         G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                         GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
+                         NULL, FALSE, NULL, ALERT_WARNING,
+                         G_ALERTDEFAULT) != G_ALERTALTERNATE)
                        return NULL;
        }
        port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;

diff --git a/src/send_message.c b/src/send_message.c
index f29d9a35f6309d8eabe944f5a5ade0663e741fea..faa7ef56665a8d3ed6867f50f672c3ff0049de6b 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -282,10 +282,9 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                                  "Do you want to continue connecting to this "
                                  "server? The communication would not be "
                                  "secure."),
-                                 _("Con_tinue connecting"), 
-                                 GTK_STOCK_CANCEL, NULL,
-                                 FALSE, NULL, ALERT_WARNING,
-                                 G_ALERTALTERNATE) != G_ALERTDEFAULT) {
+                                 GTK_STOCK_CANCEL, _("Con_tinue connecting"),
+                                 NULL, FALSE, NULL, ALERT_WARNING,
+                                 G_ALERTDEFAULT) != G_ALERTALTERNATE) {
                                session_destroy(session);
                                return -1;
                        }

diff --git a/src/summaryview.c b/src/summaryview.c
index e21967cbfbcf78e1b5cf84be73a37dd51ff793aa..421d26b33641f7bfd871fb03b1e153a8409c7b0d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3215,12 +3215,11 @@ void summary_mark_all_read(SummaryView *summaryview)
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
                          "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
-                         TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
-               if (val == G_ALERTDEFAULT ||
-                   val == (G_ALERTDEFAULT|G_ALERTDISABLE))
+               if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
                        return;
-               else if (val == (G_ALERTALTERNATE|G_ALERTDISABLE))
+               else if (val & G_ALERTDISABLE)
                        prefs_common.ask_mark_all_read = FALSE;
        }