author | zautrix <zautrix> | 2004-09-01 10:23:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-01 10:23:29 (UTC) |
commit | 6cefbdc9c8f3f3001373f10715361e2740c45395 (patch) (unidiff) | |
tree | cb2c36f57620e698913c27ca4ebe59e4a7c9d46e /kmicromail/libetpan/mh | |
parent | b9257cb225cd29bab5d96fcdaf557926603ee587 (diff) | |
download | kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.zip kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.tar.gz kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.tar.bz2 |
Mail fixes and libetpan updated
-rw-r--r-- | kmicromail/libetpan/mh/mailmh.c | 28 | ||||
-rw-r--r-- | kmicromail/libetpan/mh/mailmh.h | 7 |
2 files changed, 29 insertions, 6 deletions
diff --git a/kmicromail/libetpan/mh/mailmh.c b/kmicromail/libetpan/mh/mailmh.c index d6ff950..119f217 100644 --- a/kmicromail/libetpan/mh/mailmh.c +++ b/kmicromail/libetpan/mh/mailmh.c | |||
@@ -725,4 +725,5 @@ int mailmh_folder_get_message_size(struct mailmh_folder * folder, | |||
725 | 725 | ||
726 | int mailmh_folder_add_message(struct mailmh_folder * folder, | 726 | int mailmh_folder_add_message_uid(struct mailmh_folder * folder, |
727 | const char * message, size_t size) | 727 | const char * message, size_t size, |
728 | uint32_t * pindex) | ||
728 | { | 729 | { |
@@ -811,2 +812,5 @@ int mailmh_folder_add_message(struct mailmh_folder * folder, | |||
811 | 812 | ||
813 | if (pindex != NULL) | ||
814 | * pindex = index; | ||
815 | |||
812 | r = chash_set(folder->fl_msgs_hash, &key, &data, NULL); | 816 | r = chash_set(folder->fl_msgs_hash, &key, &data, NULL); |
@@ -827,4 +831,10 @@ int mailmh_folder_add_message(struct mailmh_folder * folder, | |||
827 | 831 | ||
828 | int mailmh_folder_add_message_file(struct mailmh_folder * folder, | 832 | int mailmh_folder_add_message(struct mailmh_folder * folder, |
829 | int fd) | 833 | const char * message, size_t size) |
834 | { | ||
835 | return mailmh_folder_add_message_uid(folder, message, size, NULL); | ||
836 | } | ||
837 | |||
838 | int mailmh_folder_add_message_file_uid(struct mailmh_folder * folder, | ||
839 | int fd, uint32_t * pindex) | ||
830 | { | 840 | { |
@@ -847,4 +857,4 @@ int mailmh_folder_add_message_file(struct mailmh_folder * folder, | |||
847 | 857 | ||
848 | r = mailmh_folder_add_message(folder, message, buf.st_size); | 858 | r = mailmh_folder_add_message_uid(folder, message, buf.st_size, pindex); |
849 | 859 | ||
850 | munmap(message, buf.st_size); | 860 | munmap(message, buf.st_size); |
@@ -854,2 +864,8 @@ int mailmh_folder_add_message_file(struct mailmh_folder * folder, | |||
854 | 864 | ||
865 | int mailmh_folder_add_message_file(struct mailmh_folder * folder, | ||
866 | int fd) | ||
867 | { | ||
868 | return mailmh_folder_add_message_file_uid(folder, fd, NULL); | ||
869 | } | ||
870 | |||
855 | int mailmh_folder_remove_message(struct mailmh_folder * folder, | 871 | int mailmh_folder_remove_message(struct mailmh_folder * folder, |
diff --git a/kmicromail/libetpan/mh/mailmh.h b/kmicromail/libetpan/mh/mailmh.h index 40432cb..00199b8 100644 --- a/kmicromail/libetpan/mh/mailmh.h +++ b/kmicromail/libetpan/mh/mailmh.h | |||
@@ -121,2 +121,6 @@ int mailmh_folder_get_message_size(struct mailmh_folder * folder, | |||
121 | 121 | ||
122 | int mailmh_folder_add_message_uid(struct mailmh_folder * folder, | ||
123 | const char * message, size_t size, | ||
124 | uint32_t * pindex); | ||
125 | |||
122 | int mailmh_folder_add_message(struct mailmh_folder * folder, | 126 | int mailmh_folder_add_message(struct mailmh_folder * folder, |
@@ -124,2 +128,5 @@ int mailmh_folder_add_message(struct mailmh_folder * folder, | |||
124 | 128 | ||
129 | int mailmh_folder_add_message_file_uid(struct mailmh_folder * folder, | ||
130 | int fd, uint32_t * pindex); | ||
131 | |||
125 | int mailmh_folder_add_message_file(struct mailmh_folder * folder, | 132 | int mailmh_folder_add_message_file(struct mailmh_folder * folder, |