+2006-12-06 [paul] 2.6.1cvs9
+
+ * src/compose.c
+ * src/messageview.c
+ * src/procheader.c
+ * src/procmime.c
+ * src/procmsg.c
+ * src/textview.c
+ more renaming
+ Thanks to Colin
+
2006-12-06 [colin] 2.6.1cvs8
* src/ssl_manager.c
( cvs diff -u -r 1.207.2.136 -r 1.207.2.137 src/folderview.c; ) > 2.6.1cvs6.patchset
( cvs diff -u -r 1.1.4.58 -r 1.1.4.59 src/etpan/imap-thread.c; ) > 2.6.1cvs7.patchset
( cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/ssl_manager.c; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/ssl_certificate.h; ) > 2.6.1cvs8.patchset
+( cvs diff -u -r 1.382.2.339 -r 1.382.2.340 src/compose.c; cvs diff -u -r 1.94.2.110 -r 1.94.2.111 src/messageview.c; cvs diff -u -r 1.47.2.36 -r 1.47.2.37 src/procheader.c; cvs diff -u -r 1.49.2.83 -r 1.49.2.84 src/procmime.c; cvs diff -u -r 1.150.2.84 -r 1.150.2.85 src/procmsg.c; cvs diff -u -r 1.96.2.160 -r 1.96.2.161 src/textview.c; ) > 2.6.1cvs9.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
gint id, param;
/* Select Account from queue headers */
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Account-Id:")) {
+ id = atoi(&queueheader_buf[strlen("X-Claws-Account-Id:")]);
+ account = account_find_from_id(id);
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Account-Id:")) {
id = atoi(&queueheader_buf[strlen("X-Sylpheed-Account-Id:")]);
sizeof(queueheader_buf), "S:")) {
account = account_find_from_address(queueheader_buf);
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Sign:")) {
+ param = atoi(&queueheader_buf[strlen("X-Claws-Sign:")]);
+ use_signing = param;
+
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Sign:")) {
param = atoi(&queueheader_buf[strlen("X-Sylpheed-Sign:")]);
use_signing = param;
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Encrypt:")) {
+ param = atoi(&queueheader_buf[strlen("X-Claws-Encrypt:")]);
+ use_encryption = param;
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Encrypt:")) {
param = atoi(&queueheader_buf[strlen("X-Sylpheed-Encrypt:")]);
use_encryption = param;
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Privacy-System:")) {
+ privacy_system = g_strdup(&queueheader_buf[strlen("X-Claws-Privacy-System:")]);
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Privacy-System:")) {
privacy_system = g_strdup(&queueheader_buf[strlen("X-Sylpheed-Privacy-System:")]);
"SSH:", "R:", "MAID:",
"NAID:", "RMID:", "FMID:",
"SCF:", "RRCPT:", "NG:",
+ "X-Claws-Privacy", "X-Claws-Sign:", "X-Claws-Encrypt",
+ "X-Claws-End-Special-Headers:", "X-Claws-Account-Id:",
"X-Sylpheed-Privacy", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt",
- "X-Sylpheed-End-Special-Headers:",
+ "X-Sylpheed-End-Special-Headers:", "X-Sylpheed-Account-Id:",
NULL
};
if ((fp = g_fopen(compose->redirect_filename, "rb")) == NULL) {
if (compose->privacy_system != NULL) {
- fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
- fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
+ fprintf(fp, "X-Claws-Privacy-System:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Claws-Sign:%d\n", compose->use_signing);
if (compose->use_encryption) {
gchar *encdata;
if (mailac && mailac->encrypt_to_self) {
}
if (encdata != NULL) {
if (strcmp(encdata, "_DONT_ENCRYPT_")) {
- fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
- fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n",
+ fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Claws-Encrypt-Data:%s\n",
encdata);
} /* else we finally dont want to encrypt */
} else {
- fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
lock = FALSE;
}
/* end of headers */
- fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+ fprintf(fp, "X-Claws-End-Special-Headers: 1\n");
if (compose->redirect_filename != NULL) {
if (compose_redirect_write_to_file(compose, fp) < 0) {
}
/* Save draft infos */
- fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
+ fprintf(fp, "X-Claws-Account-Id:%d\n", compose->account->account_id);
fprintf(fp, "S:%s\n", compose->account->address);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
fprintf(fp, "RRCPT:1\n");
}
if (compose->privacy_system) {
- fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
- fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
- fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Claws-Sign:%d\n", compose->use_signing);
+ fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Claws-Privacy-System:%s\n", compose->privacy_system);
}
/* Message-ID of message replying to */
}
/* end of headers */
- fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+ fprintf(fp, "X-Claws-End-Special-Headers: 1\n");
if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE, action != COMPOSE_AUTO_SAVE) < 0) {
fclose(fp);
g_free(path);
}
- fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+ fprintf(fp, "X-Claws-End-Special-Headers: 1\n");
/* Date */
get_rfc822_date(buf, sizeof(buf));
if (MSG_IS_QUEUED(flags) || MSG_IS_DRAFT(flags)) {
while (get_one_field(buf, sizeof(buf), data, NULL) != -1) {
- if (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
- strlen("X-Sylpheed-End-Special-Headers:")))
+ if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+ strlen("X-Claws-End-Special-Headers:"))) ||
+ (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+ strlen("X-Sylpheed-End-Special-Headers:"))))
break;
/* from other mailers */
if (!strncmp(buf, "Date: ", 6)
/* Skip queue header */
while (fgets(buf, sizeof(buf), fp) != NULL) {
/* new way */
- if (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
- strlen("X-Sylpheed-End-Special-Headers:")))
+ if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+ strlen("X-Claws-End-Special-Headers:"))) ||
+ (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+ strlen("X-Sylpheed-End-Special-Headers:"))))
break;
/* old way */
if (buf[0] == '\r' || buf[0] == '\n') break;
Q_PRIVACY_SYSTEM = 9,
Q_ENCRYPT = 10,
Q_ENCRYPT_DATA = 11,
- Q_CLAWS_HDRS = 12,
+ Q_CLAWS_HDRS = 12,
+ Q_PRIVACY_SYSTEM_OLD = 13,
+ Q_ENCRYPT_OLD = 14,
+ Q_ENCRYPT_DATA_OLD = 15,
+ Q_CLAWS_HDRS_OLD = 16,
};
GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
while (fgets(buf, sizeof(buf), fp) != NULL) {
/* new way */
- if (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
- strlen("X-Sylpheed-End-Special-Headers:")))
+ if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+ strlen("X-Claws-End-Special-Headers:"))) ||
+ (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+ strlen("X-Sylpheed-End-Special-Headers:"))))
break;
/* old way */
if (buf[0] == '\r' || buf[0] == '\n') break;
{"SCF:", NULL, FALSE},
{"RMID:", NULL, FALSE},
{"FMID:", NULL, FALSE},
+ {"X-Claws-Privacy-System:", NULL, FALSE},
+ {"X-Claws-Encrypt:", NULL, FALSE},
+ {"X-Claws-Encrypt-Data:", NULL, FALSE},
+ {"X-Claws-End-Special-Headers", NULL, FALSE},
{"X-Sylpheed-Privacy-System:", NULL, FALSE},
{"X-Sylpheed-Encrypt:", NULL, FALSE},
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
/* new way */
- if (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
- strlen("X-Sylpheed-End-Special-Headers:")))
+ if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+ strlen("X-Claws-End-Special-Headers:"))) ||
+ (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+ strlen("X-Sylpheed-End-Special-Headers:"))))
break;
/* old way */
if (buf[0] == '\r' || buf[0] == '\n') break;
{"SCF:", NULL, FALSE},
{"RMID:", NULL, FALSE},
{"FMID:", NULL, FALSE},
+ {"X-Claws-Privacy-System:", NULL, FALSE},
+ {"X-Claws-Encrypt:", NULL, FALSE},
+ {"X-Claws-Encrypt-Data:", NULL, FALSE},
+ {"X-Claws-End-Special-Headers:", NULL, FALSE},
{"X-Sylpheed-Privacy-System:", NULL, FALSE},
{"X-Sylpheed-Encrypt:", NULL, FALSE},
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
fwdmessageid = g_strdup(p);
break;
case Q_PRIVACY_SYSTEM:
+ case Q_PRIVACY_SYSTEM_OLD:
if (privacy_system == NULL)
privacy_system = g_strdup(p);
break;
case Q_ENCRYPT:
+ case Q_ENCRYPT_OLD:
if (p[0] == '1')
encrypt = TRUE;
break;
case Q_ENCRYPT_DATA:
+ case Q_ENCRYPT_DATA_OLD:
if (encrypt_data == NULL)
encrypt_data = g_strdup(p);
break;
case Q_CLAWS_HDRS:
+ case Q_CLAWS_HDRS_OLD:
/* end of special headers reached */
goto send_mail; /* can't "break;break;" */
}
{"AF:", "NF:", "PS:", "SRH:", "SFN:", "DSR:", "MID:",
"CFG:", "PT:", "S:", "RQ:", "SSV:", "NSV:", "SSH:",
"R:", "MAID:", "SCF:", "RMID:", "FMID:", "NAID:",
+ "X-Claws-Account-Id:", "X-Claws-Sign:", "X-Claws-Encrypt:",
+ "X-Claws-Privacy-System:", "X-Claws-End-Special-Headers:",
"X-Sylpheed-Account-Id:", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt:",
"X-Sylpheed-Privacy-System:", "X-Sylpheed-End-Special-Headers:",
NULL};