From: Tristan Chabredier Date: Thu, 15 Nov 2012 08:18:21 +0000 (+0000) Subject: 2012-11-15 [wwp] 3.9.0cvs3 X-Git-Tag: 3.9.1~201 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c08c3f774557155bb0ff092bfda7cd1d512e93a6 2012-11-15 [wwp] 3.9.0cvs3 * doc/man/claws-mail.1 * src/main.c Add --cancel-receiving command-line switch. --- diff --git a/ChangeLog b/ChangeLog index dfc064d31..4bb087028 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-11-15 [wwp] 3.9.0cvs3 + + * doc/man/claws-mail.1 + * src/main.c + Add --cancel-receiving command-line switch. + 2012-11-15 [wwp] 3.9.0cvs2 * src/ssl_manager.c diff --git a/PATCHSETS b/PATCHSETS index 19dee2690..4a059244b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4500,3 +4500,4 @@ ( cvs diff -u -r 1.58.2.50 -r 1.58.2.51 po/de.po; cvs diff -u -r 1.60.2.65 -r 1.60.2.66 po/es.po; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 po/fi.po; cvs diff -u -r 1.42.2.58 -r 1.42.2.59 po/fr.po; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 po/hu.po; cvs diff -u -r 1.50.2.44 -r 1.50.2.45 po/pt_BR.po; cvs diff -u -r 1.4.2.12 -r 1.4.2.13 po/sv.po; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/uk.po; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/zh_TW.po; ) > 3.8.1cvs123.patchset ( cvs diff -u -r 1.9.2.25 -r 1.9.2.26 po/cs.po; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 po/fi.po; cvs diff -u -r 1.2.2.36 -r 1.2.2.37 po/sk.po; ) > 3.9.0cvs1.patchset ( cvs diff -u -r 1.3.2.39 -r 1.3.2.40 src/ssl_manager.c; cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/gtk/sslcertwindow.c; ) > 3.9.0cvs2.patchset +( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 doc/man/claws-mail.1; cvs diff -u -r 1.115.2.259 -r 1.115.2.260 src/main.c; ) > 3.9.0cvs3.patchset diff --git a/configure.ac b/configure.ac index ce181ff7b..488badf20 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=2 +EXTRA_VERSION=3 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1 index b925ea22f..3f909c88a 100644 --- a/doc/man/claws-mail.1 +++ b/doc/man/claws-mail.1 @@ -105,6 +105,8 @@ This list is not complete. .br \fB \-\-receive\-all\fR .br +\fB \-\-cancel\-receiving\fR +.br \fB \-\-send\fR .br \fB \-\-status\fR @@ -271,6 +273,9 @@ receive new messages \fB\-\-receive\-all\fR receive new messages from all accounts .TP +\fB\-\-cancel\-receiving\fR +cancel receiving of messages +.TP \fB\-\-send\fR .br send all queued messages diff --git a/src/main.c b/src/main.c index 443e41954..6e9b246c2 100644 --- a/src/main.c +++ b/src/main.c @@ -204,6 +204,7 @@ typedef enum static struct RemoteCmd { gboolean receive; gboolean receive_all; + gboolean cancel_receiving; gboolean compose; const gchar *compose_mailto; GList *attach_files; @@ -1131,7 +1132,7 @@ int main(int argc, char *argv[]) #endif if (cmd.status || cmd.status_full || cmd.search || - cmd.statistics || cmd.reset_statistics) { + cmd.statistics || cmd.reset_statistics || cmd.cancel_receiving) { puts("0 Claws Mail not running."); lock_socket_remove(); return 0; @@ -1931,6 +1932,8 @@ static void parse_cmd_opt(int argc, char *argv[]) cmd.receive_all = TRUE; } else if (!strncmp(argv[i], "--receive", 9)) { cmd.receive = TRUE; + } else if (!strncmp(argv[i], "--cancel-receiving", 18)) { + cmd.cancel_receiving = TRUE; } else if (!strncmp(argv[i], "--compose-from-file", 19)) { const gchar *p = (i+1 < argc)?argv[i+1]:NULL; @@ -2053,6 +2056,7 @@ static void parse_cmd_opt(int argc, char *argv[]) " attached")); g_print("%s\n", _(" --receive receive new messages")); g_print("%s\n", _(" --receive-all receive new messages of all accounts")); + g_print("%s\n", _(" --cancel-receiving cancel receiving of messages")); g_print("%s\n", _(" --search folder type request [recursive]\n" " searches mail\n" " folder ex.: \"#mh/Mailbox/inbox\" or \"Mail\"\n" @@ -2381,6 +2385,8 @@ static gint prohibit_duplicate_launch(void) fd_write_all(uxsock, "receive_all\n", 12); } else if (cmd.receive) { fd_write_all(uxsock, "receive\n", 8); + } else if (cmd.cancel_receiving) { + fd_write_all(uxsock, "cancel_receiving\n", 17); } else if (cmd.compose && cmd.attach_files) { gchar *str, *compose_str; @@ -2566,6 +2572,9 @@ static void lock_socket_input_cb(gpointer data, prefs_common.newmail_notify_manu); } else if (!strncmp(buf, "receive", 7)) { inc_mail(mainwin, prefs_common.newmail_notify_manu); + } else if (!strncmp(buf, "cancel_receiving", 16)) { + inc_cancel_all(); + imap_cancel_all(); } else if (!strncmp(buf, "compose_attach", 14)) { GList *files = NULL, *curr; AttachInfo *ainfo;