CVS: sylpheedclaws/sylpheed-claws/src compose.c,1.382.2.339,1.382.2.340 messageview.c,1.94.2.110,1.94.2.111 procheader.c,1.47.2.36,1.47.2.37 procmime.c,1.49.2.83,1.49.2.84 procmsg.c,1.150.2.84,1.150.2.85 textview.c,1.96.2.160,1.96.2.161
[email protected] Wed, 06 Dec 2006 08:18:40 +0000
Newsgroups
gmane.mail.sylpheed.claws.cvs
Message-ID
<[email protected] >
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv11905/src
Modified Files:
Tag: gtk2
compose.c messageview.c procheader.c procmime.c procmsg.c
textview.c
Log Message:
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
Index: compose.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/compose.c,v
retrieving revision 1.382.2.339
retrieving revision 1.382.2.340
diff -u -d -r1.382.2.339 -r1.382.2.340
--- compose.c 2006/12/04 19:00:39 1.382.2.339
+++ compose.c 2006/12/06 08:18:28 1.382.2.340
@@ -1773,6 +1773,11 @@
/* 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:")]);
account = account_find_from_id(id);
@@ -1792,17 +1797,32 @@
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:")]);
}
@@ -4543,8 +4563,10 @@
"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) {
@@ -5024,8 +5046,8 @@
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) {
@@ -5038,12 +5060,12 @@
}
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;
@@ -5086,7 +5108,7 @@
}
/* 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) {
@@ -7957,7 +7979,7 @@
}
/* 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))) {
@@ -7971,9 +7993,9 @@
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 */
@@ -7994,7 +8016,7 @@
}
/* 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);
Index: messageview.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/messageview.c,v
retrieving revision 1.94.2.110
retrieving revision 1.94.2.111
diff -u -d -r1.94.2.110 -r1.94.2.111
--- messageview.c 2006/11/14 07:26:40 1.94.2.110
+++ messageview.c 2006/12/06 08:18:32 1.94.2.111
@@ -666,7 +666,7 @@
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));
Index: procheader.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/procheader.c,v
retrieving revision 1.47.2.36
retrieving revision 1.47.2.37
diff -u -d -r1.47.2.36 -r1.47.2.37
--- procheader.c 2006/11/07 10:39:26 1.47.2.36
+++ procheader.c 2006/12/06 08:18:32 1.47.2.37
@@ -449,8 +449,10 @@
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)
Index: procmime.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/procmime.c,v
retrieving revision 1.49.2.83
retrieving revision 1.49.2.84
diff -u -d -r1.49.2.83 -r1.49.2.84
--- procmime.c 2006/11/07 10:39:26 1.49.2.83
+++ procmime.c 2006/12/06 08:18:32 1.49.2.84
@@ -1899,8 +1899,10 @@
/* 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;
Index: procmsg.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/procmsg.c,v
retrieving revision 1.150.2.84
retrieving revision 1.150.2.85
diff -u -d -r1.150.2.84 -r1.150.2.85
--- procmsg.c 2006/11/27 08:06:20 1.150.2.84
+++ procmsg.c 2006/12/06 08:18:33 1.150.2.85
@@ -65,7 +65,11 @@
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)
@@ -550,8 +554,10 @@
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;
@@ -773,6 +779,10 @@
{"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},
@@ -1038,8 +1048,10 @@
}
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;
@@ -1464,6 +1476,10 @@
{"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},
@@ -1539,18 +1555,22 @@
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;" */
}
Index: textview.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/textview.c,v
retrieving revision 1.96.2.160
retrieving revision 1.96.2.161
diff -u -d -r1.96.2.160 -r1.96.2.161
--- textview.c 2006/11/30 18:45:38 1.96.2.160
+++ textview.c 2006/12/06 08:18:34 1.96.2.161
@@ -1650,6 +1650,8 @@
{"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};