gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2006-08-17 [colin] 2.4.0cvs60

Browse source 
* src/compose.c
		Don't continue queuing if Cancel is clicked
		in select-keys
This commit is contained in:
Colin Leroy 2006-08-17 20:21:23 +00:00
parent ec355510c1
commit 077ca08451
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-08-17 [colin] 2.4.0cvs60
* src/compose.c
Don't continue queuing if Cancel is clicked
in select-keys
2006-08-17 [colin] 2.4.0cvs59
* src/plugins/pgpcore/select-keys.c

1
PATCHSETS
View file

@ -1751,3 +1751,4 @@
( cvs diff -u -r 1.179.2.128 -r 1.179.2.129 src/imap.c; cvs diff -u -r 1.83.2.78 -r 1.83.2.79 src/mimeview.c; cvs diff -u -r 1.150.2.71 -r 1.150.2.72 src/procmsg.c; cvs diff -u -r 1.36.2.74 -r 1.36.2.75 src/common/utils.c; cvs diff -u -r 1.20.2.34 -r 1.20.2.35 src/common/utils.h; cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/inputdialog.h; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpinline/pgpinline.c; ) > 2.4.0cvs57.patchset
( cvs diff -u -r 1.83.2.79 -r 1.83.2.80 src/mimeview.c; cvs diff -u -r 1.204.2.96 -r 1.204.2.97 src/prefs_common.c; cvs diff -u -r 1.103.2.57 -r 1.103.2.58 src/prefs_common.h; cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/prefs_ext_prog.c; cvs diff -u -r 1.96.2.137 -r 1.96.2.138 src/textview.c; ) > 2.4.0cvs58.patchset
( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/select-keys.c; ) > 2.4.0cvs59.patchset
( cvs diff -u -r 1.382.2.301 -r 1.382.2.302 src/compose.c; ) > 2.4.0cvs60.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=59
EXTRA_VERSION=60
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

11
src/compose.c
View file

@ -4084,6 +4084,9 @@ gint compose_send(Compose *compose)
if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
} else if (val == -5) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Couldn't get recipient encryption key."));
} else if (val == -3) {
if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
@ -4808,6 +4811,11 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
lock = FALSE;
fclose(fp);
g_unlink(tmp);
g_free(tmp);
return -5;
}
g_free(encdata);
}
@ -7560,6 +7568,9 @@ static void compose_send_later_cb(gpointer data, guint action,
} else if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
} else if (val == -5) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Couldn't get recipient encryption key."));
}
toolbar_main_set_sensitive(mainwindow_get_mainwindow());
}