2005-08-24 [paul] 1.9.13cvs58

	* src/compose.c
		don't claim success when clicking
		Cancel on the passphrase box.
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 820674ea1f81c4dbe2b1ea37dd17ed8d76cbe37b..c5fb49bafc6ba6a90e7e9da9b87ea3351397d257 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-08-24 [paul]      1.9.13cvs58
+
+       * src/compose.c
+               don't claim success when clicking
+               Cancel on the passphrase box.
+               Patch by Colin
+

 2005-08-24 [paul]      1.9.13cvs57
 
        * src/main.c
 2005-08-24 [paul]      1.9.13cvs57
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 85e63575a46cdb221ea1dd4d71be9e77152c6061..e04571a6e1dbacc4cd647e44bc26d0bfa8b6e32c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -743,3 +743,4 @@
 ( cvs diff -u -r 1.382.2.154 -r 1.382.2.155 src/compose.c;  ) > 1.9.13cvs55.patchset
 ( cvs diff -u -r 1.179.2.59 -r 1.179.2.60 src/imap.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/imap-thread.h;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/sylpheed-marshal.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/sylpheed-marshal.h;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 tools/kdeservicemenu/README;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 tools/kdeservicemenu/install.sh;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/kdeservicemenu/template_sylpheed-attach-files.desktop;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop;  ) > 1.9.13cvs56.patchset
 ( cvs diff -u -r 1.115.2.51 -r 1.115.2.52 src/main.c;  cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/common/defs.h;  ) > 1.9.13cvs57.patchset
 ( cvs diff -u -r 1.382.2.154 -r 1.382.2.155 src/compose.c;  ) > 1.9.13cvs55.patchset
 ( cvs diff -u -r 1.179.2.59 -r 1.179.2.60 src/imap.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/imap-thread.h;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/sylpheed-marshal.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/sylpheed-marshal.h;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 tools/kdeservicemenu/README;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 tools/kdeservicemenu/install.sh;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/kdeservicemenu/template_sylpheed-attach-files.desktop;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop;  ) > 1.9.13cvs56.patchset
 ( cvs diff -u -r 1.115.2.51 -r 1.115.2.52 src/main.c;  cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/common/defs.h;  ) > 1.9.13cvs57.patchset

+( cvs diff -u -r 1.382.2.155 -r 1.382.2.156 src/compose.c;  ) > 1.9.13cvs58.patchset

diff --git a/configure.ac b/configure.ac
index 1d30dc85f5bc4f618f4a4b905d625f3816b0086c..55e94614dde07e82e8c0ff500f1307ef644bf916 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=57
+EXTRA_VERSION=58

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 7cd932b072f90648afe925a6f02540ff736f71b1..60ecdce61908e420c2ee859b4054a7527323f29b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3377,7 +3377,10 @@ gint compose_send(Compose *compose)
        val = compose_queue(compose, &msgnum, &folder);
 
        if (val) {
        val = compose_queue(compose, &msgnum, &folder);
 
        if (val) {

-               if (val == -2) {
+               if (val == -3) {
+                       alertpanel_error(_("Could not queue message for sending:\n\n"
+                                          "Signature failed."));
+               } else if (val == -2) {

                        alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
                } else {
                        alertpanel_error(_("Could not queue message for sending."));
                        alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
                } else {
                        alertpanel_error(_("Could not queue message for sending."));


@@ -3806,7 +3809,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
        if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && 
            privacy_system_can_sign(compose->privacy_system))
                if (!privacy_sign(compose->privacy_system, mimemsg, compose->account))
        if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing && 
            privacy_system_can_sign(compose->privacy_system))
                if (!privacy_sign(compose->privacy_system, mimemsg, compose->account))

-                       return -1;
+                       return -2;

 
        procmime_write_mimeinfo(mimemsg, fp);
        
 
        procmime_write_mimeinfo(mimemsg, fp);
        


@@ -4066,12 +4069,13 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                        return -2;
                }
        } else {
                        return -2;
                }
        } else {

-               if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND) < 0) {
+               gint result = 0;
+               if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND)) < 0) {

                        lock = FALSE;
                        fclose(fp);
                        g_unlink(tmp);
                        g_free(tmp);
                        lock = FALSE;
                        fclose(fp);
                        g_unlink(tmp);
                        g_free(tmp);

-                       return -2;
+                       return result - 1; /* -2 for a generic error, -3 for signing error */

                }
        }
 
                }
        }