+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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)
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;
}
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)
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)
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
"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
"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 ?
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) {
"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;
}
"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;
}
"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;
"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;
}
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;
}