2005-10-03 [colin] 1.9.15cvs1

	* src/compose.c
	* src/imap.c
	* src/inc.c
	* src/main.c
	* src/messageview.c
	* src/news.c
	* src/summaryview.c
	* src/gtk/sslcertwindow.c
	* src/plugins/trayicon/trayicon.c
		Add accels to every AlertPanel. Patch by Fabien
		Vantard

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ed05b791618bc31e3776e415d9d03880c522e0aa..d4b39745e1ce7e6141c341b37a4c0971f4640283 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,17 @@
+2005-10-03 [colin]     1.9.15cvs1
+
+       * src/compose.c
+       * src/imap.c
+       * src/inc.c
+       * src/main.c
+       * src/messageview.c
+       * src/news.c
+       * src/summaryview.c
+       * src/gtk/sslcertwindow.c
+       * src/plugins/trayicon/trayicon.c
+               Add accels to every AlertPanel. Patch by Fabien 
+               Vantard
+
 2005-10-03 [paul]      1.9.15
 
        1.9.15 released

diff --git a/PATCHSETS b/PATCHSETS
index 6a850212f585447aedd6902ac996fbbb0b24f16a..daac0e3a125a51db0e226a38e66de0362d8f3956 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -837,3 +837,4 @@
 ( cvs diff -u -r 1.115.2.55 -r 1.115.2.56 src/main.c;  ) > 1.9.14cvs66.patchset
 ( cvs diff -u -r 1.17.2.19 -r 1.17.2.20 src/send_message.c;  ) > 1.9.14cvs67.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/ca.po;  cvs diff -u -r 1.58.2.13 -r 1.58.2.14 po/de.po;  cvs diff -u -r 1.60.2.15 -r 1.60.2.16 po/es.po;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/fi.po;  cvs diff -u -r 1.42.2.15 -r 1.42.2.16 po/fr.po;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 po/sk.po;  cvs diff -u -r 1.17.2.13 -r 1.17.2.14 po/sr.po;  cvs diff -u -r 1.5.2.9 -r 1.5.2.10 po/zh_CN.po;  ) > 1.9.14cvs68.patchset
+( cvs diff -u -r 1.382.2.177 -r 1.382.2.178 src/compose.c;  cvs diff -u -r 1.179.2.73 -r 1.179.2.74 src/imap.c;  cvs diff -u -r 1.149.2.35 -r 1.149.2.36 src/inc.c;  cvs diff -u -r 1.115.2.56 -r 1.115.2.57 src/main.c;  cvs diff -u -r 1.94.2.65 -r 1.94.2.66 src/messageview.c;  cvs diff -u -r 1.101.2.16 -r 1.101.2.17 src/news.c;  cvs diff -u -r 1.395.2.128 -r 1.395.2.129 src/summaryview.c;  cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/gtk/sslcertwindow.c;  cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs1.patchset

diff --git a/configure.ac b/configure.ac
index a23a0ea4e7576fa457ef13e445bd12965e7ed668..603ae9137111c75b3778ca0e0b4a932ffb83bac4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index f4ae3cb1c8a4071bb58a1ab9b5dedf643dc9aa61..078ac50e798abdf78468f1dad0ae5f9b8e15b3c7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6913,7 +6913,7 @@ static void compose_close_cb(gpointer data, guint action, GtkWidget *widget)
        if (compose->modified) {
                val = alertpanel(_("Discard message"),
                                 _("This message has been modified. Discard it?"),
-                                _("Discard"), _("Save to Drafts"), GTK_STOCK_CANCEL);
+                                _("_Discard"), _("_Save to Drafts"), GTK_STOCK_CANCEL);
 
                switch (val) {
                case G_ALERTDEFAULT:

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index b6b2e6076430b5d0cffd8f8627d4de8d53d6d0d8..2060d42ba6f95a10137cc1af86ecea83a33f21ba 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -265,7 +265,7 @@ 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,
+                             _("_Accept and save"), _("_Cancel connection"), NULL,
                              FALSE, vbox, ALERT_QUESTION, G_ALERTDEFAULT);
        
        return (val == G_ALERTDEFAULT);
@@ -318,7 +318,7 @@ 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,
+                             _("_Accept and save"), _("_Cancel connection"), NULL,
                              FALSE, vbox2, ALERT_WARNING, G_ALERTDEFAULT);
        
        return (val == G_ALERTDEFAULT);

diff --git a/src/imap.c b/src/imap.c
index 85ad190c79d466dfdac64731a4ec6f448f66df37..9a59040844c456db6101d1bd24ce6f1a117e7fea 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -738,7 +738,7 @@ static IMAPSession *imap_session_new(Folder * folder,
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Continue connecting"), 
+                         _("Con_tinue connecting"), 
                          GTK_STOCK_CANCEL, NULL,
                          FALSE, NULL, ALERT_WARNING,
                          G_ALERTALTERNATE) != G_ALERTDEFAULT)

diff --git a/src/inc.c b/src/inc.c
index d62a89f1b8f71407b6ca9472c901baa0c634b79d..475eeaec7ea4fe50aa22466f08424a8d3a2bafb2 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -759,7 +759,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Continue connecting"), 
+                         _("Con_tinue connecting"), 
                          GTK_STOCK_CANCEL, NULL,
                          FALSE, NULL, ALERT_WARNING,
                          G_ALERTALTERNATE) != G_ALERTDEFAULT)

diff --git a/src/main.c b/src/main.c
index a9457f2e6101a1e5fd53db0b9e071e66d95a45e8..a197f579a343f1c506f492c4bdcc81eb5ef0f413 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -779,11 +779,11 @@ gboolean clean_quit(gpointer data)
 void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
-       
+
        if (compose_get_compose_list()) {
                gint val = alertpanel(_("Really quit?"),
                               _("Composing message exists."),
-                              _("Draft them"), _("Discard them"), _("Don't quit"));
+                              _("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
                switch (val) {
                        case G_ALERTOTHER:
                                return;
@@ -792,7 +792,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                        default:
                                draft_all_messages();
                }
-               
+
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 

diff --git a/src/messageview.c b/src/messageview.c
index f08c8fa939883117f8dfd059c63b28b1473d3d33..c127298c3b62a68aefbdaa34bed4e7be1c6d1d32 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -548,15 +548,14 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                AlertValue val;
                gchar *message;
                message = g_strdup_printf(
-                                _("The notification address to which the "
-                                  "return receipt is to be sent\n"
-                                  "does not correspond to the return path:\n"
-                                  "Notification address: %s\n"
-                                  "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,
+                 _("The notification address to which the return receipt is\n"
+                   "to be sent does not correspond to the return path:\n"
+                   "Notification address: %s\n"
+                   "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);
                g_free(message);                                
                if (val != G_ALERTDEFAULT)
@@ -569,21 +568,20 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        if (ac_list == NULL) {
                AlertValue val = 
                alertpanel_full(_("Warning"),
-                               _("This message is asking for a return "
-                               "receipt notification\n"
-                               "but according to its 'To:' and 'CC:' "
-                               "headers it was not\nofficially 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);
+                 _("This message is asking for a return receipt notification\n"
+                   "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)
                        return -1;
        }
 
-       if (g_list_length(ac_list) > 1)
-               account = select_account_from_list(ac_list);
+       if (g_list_length(ac_list) > 1) {
+               if ((account = select_account_from_list(ac_list)) == NULL)
+                       return -1;
+       }
        else if (ac_list != NULL)
                account = (PrefsAccount *) ac_list->data;
        g_list_free(ac_list);
@@ -1271,7 +1269,7 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
                                  "accounts.\n"
                                  "Please choose which account do you want to "
                                  "use for sending the receipt notification:"),
-                               _("Send Notification"), _("+Cancel"), NULL,
+                               _("_Send Notification"), _("+_Cancel"), NULL,
                                optmenu) != G_ALERTDEFAULT)
                return NULL;
        return account_find_from_id(account_id);

diff --git a/src/news.c b/src/news.c
index 6961f258449a38579394640239884900d6827a08..f6a102c732459d57c6d989bc45e16fb232220ef8 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -253,7 +253,7 @@ static Session *news_session_new_for_folder(Folder *folder)
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Continue connecting"), 
+                         _("Con_tinue connecting"), 
                          GTK_STOCK_CANCEL, NULL,
                          FALSE, NULL, ALERT_WARNING,
                          G_ALERTALTERNATE) != G_ALERTDEFAULT)

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index c24234b6a62b5879a968e74622fc0969d449a9fe..9d6ea5bbfc80ad15f8007bcd821bf823ae98cefa 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -340,7 +340,7 @@ static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit this program?"),
-                              _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
+                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL) != G_ALERTDEFAULT)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }

diff --git a/src/summaryview.c b/src/summaryview.c
index dea51ab1054b32dbec3e207f2e30fea34f954f3c..84dfc837bd111f0e300f1ed65430f8a526784c0a 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3500,7 +3500,7 @@ void summary_save_as(SummaryView *summaryview)
        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
                                  _("Append or overwrite existing file?"),
-                                 _("Append"), _("Overwrite"),
+                                 _("_Append"), _("_Overwrite"),
                                  GTK_STOCK_CANCEL);
                if (aval != 0 && aval != 1)
                        return;
@@ -5518,6 +5518,9 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
        g_return_val_if_fail(msginfo_update != NULL, TRUE);
        g_return_val_if_fail(summaryview != NULL, FALSE);
 
+       if (summary_is_locked(summaryview))
+               return FALSE;
+
        if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
                node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);