aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@HelixCode.com>2000-10-12 21:38:51 +0800
committerMichael Zucci <zucchi@src.gnome.org>2000-10-12 21:38:51 +0800
commit6c337e9ea0623b48688c018973d35823dde21f60 (patch)
tree395633c625a76dd5801e9aff79105f4120688ddb
parent4e7e9477148d8558b48c7b3a10831c73e0e4b326 (diff)
downloadgsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.tar
gsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.tar.gz
gsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.tar.bz2
gsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.tar.lz
gsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.tar.xz
gsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.tar.zst
gsoc2013-evolution-6c337e9ea0623b48688c018973d35823dde21f60.zip
Removed temp_message_buffer, and content_input_stream fields which seem to
2000-10-11 Not Zed <NotZed@HelixCode.com> * camel-mime-part.h (struct _CamelMimePart): Removed temp_message_buffer, and content_input_stream fields which seem to have come from nowhere, and are unused. * camel-mime-utils.c: Added a note about touching this file. Nobody is to touch it without asking me first. That goes for you too Jeff. (header_decode_text): In what way is this broken? 2000-10-10 Not Zed <NotZed@HelixCode.com> * providers/imap/camel-imap-folder.c (imap_get_summary_internal): Fix camel_summary_* function rename (imap_get_message_info_internal): Likewise. * camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake. * camel-folder-summary.c (camel_summary_format_address): Uh, why do we encode and then decode here ... sigh. This is not the way to fix this. (camel_folder_summary_format_address): Renamed to a proper name, this was only supposed to be a private function. (camel_folder_summary_format_string): Likewise. Oh i see why it was made public, code reuse by cut & paste. Joy. svn path=/trunk/; revision=5881
-rw-r--r--camel/ChangeLog28
-rw-r--r--camel/camel-folder-summary.c12
-rw-r--r--camel/camel-folder-summary.h4
-rw-r--r--camel/camel-mime-parser.c4
-rw-r--r--camel/camel-mime-part.c9
-rw-r--r--camel/camel-mime-part.h2
-rw-r--r--camel/camel-mime-utils.c5
-rw-r--r--camel/providers/imap/camel-imap-folder.c16
8 files changed, 53 insertions, 27 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index a5ad4ec8e9..b38c4bc322 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,30 @@
+2000-10-11 Not Zed <NotZed@HelixCode.com>
+
+ * camel-mime-part.h (struct _CamelMimePart): Removed
+ temp_message_buffer, and content_input_stream fields which seem to
+ have come from nowhere, and are unused.
+
+ * camel-mime-utils.c: Added a note about touching this file.
+ Nobody is to touch it without asking me first. That goes for you
+ too Jeff.
+ (header_decode_text): In what way is this broken?
+
+2000-10-10 Not Zed <NotZed@HelixCode.com>
+
+ * providers/imap/camel-imap-folder.c (imap_get_summary_internal):
+ Fix camel_summary_* function rename
+ (imap_get_message_info_internal): Likewise.
+
+ * camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake.
+
+ * camel-folder-summary.c (camel_summary_format_address): Uh, why
+ do we encode and then decode here ... sigh. This is not the way
+ to fix this.
+ (camel_folder_summary_format_address): Renamed to a proper name,
+ this was only supposed to be a private function.
+ (camel_folder_summary_format_string): Likewise. Oh i see why it
+ was made public, code reuse by cut & paste. Joy.
+
2000-10-11 Chris Toshok <toshok@helixcode.com>
* providers/nntp/camel-nntp-store.c (nntp_store_unsubscribe_folder): remove the leading '/'.
@@ -44,6 +71,7 @@
* providers/nntp/camel-nntp-newsrc.c: robustification and bug
fixes.
+>>>>>>> 1.527
2000-10-06 Jeffrey Stedfast <fejj@helixcode.com>
* camel-folder-summary.c (camel_summary_format_address): Decode
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 4ee6be69f7..d3881f5857 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -920,7 +920,7 @@ static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary
}
char *
-camel_summary_format_address(struct _header_raw *h, const char *name)
+camel_folder_summary_format_address(struct _header_raw *h, const char *name)
{
struct _header_address *addr;
const char *text;
@@ -942,7 +942,7 @@ camel_summary_format_address(struct _header_raw *h, const char *name)
}
char *
-camel_summary_format_string(struct _header_raw *h, const char *name)
+camel_folder_summary_format_string(struct _header_raw *h, const char *name)
{
const char *text;
@@ -964,10 +964,10 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h)
mi = g_malloc0(s->message_info_size);
- mi->subject = camel_summary_format_string(h, "subject");
- mi->from = camel_summary_format_address(h, "from");
- mi->to = camel_summary_format_address(h, "to");
- mi->cc = camel_summary_format_address(h, "cc");
+ mi->subject = camel_folder_summary_format_string(h, "subject");
+ mi->from = camel_folder_summary_format_address(h, "from");
+ mi->to = camel_folder_summary_format_address(h, "to");
+ mi->cc = camel_folder_summary_format_address(h, "cc");
mi->user_flags = NULL;
mi->user_tags = NULL;
mi->date_sent = header_decode_date(header_raw_find(&h, "date", NULL), NULL);
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index ec1799e103..77d8abfb68 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -193,8 +193,8 @@ CamelMessageInfo *camel_folder_summary_uid(CamelFolderSummary *, const char *uid
void camel_folder_summary_offset_content(CamelMessageContentInfo *content, off_t offset);
/* summary formatting utils */
-char *camel_summary_format_address (struct _header_raw *h, const char *name);
-char *camel_summary_format_string (struct _header_raw *h, const char *name);
+char *camel_folder_summary_format_address (struct _header_raw *h, const char *name);
+char *camel_folder_summary_format_string (struct _header_raw *h, const char *name);
/* summary file loading/saving helper functions */
int camel_folder_summary_encode_fixed_int32(FILE *, gint32);
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index e07bb27682..d992af1778 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -319,7 +319,7 @@ camel_mime_parser_init (CamelMimeParser *obj)
}
static void
-camel_mime_parser_finalize(CamelObject *o)
+camel_mime_parser_finalise(CamelObject *o)
{
struct _header_scan_state *s = _PRIVATE(o);
#ifdef PURIFY
@@ -340,7 +340,7 @@ camel_mime_parser_get_type (void)
(CamelObjectClassInitFunc) camel_mime_parser_class_init,
NULL,
(CamelObjectInitFunc) camel_mime_parser_init,
- (CamelObjectFinalizeFunc) camel_mime_parser_finalize);
+ (CamelObjectFinalizeFunc) camel_mime_parser_finalise);
}
return type;
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 21deb4c5f9..e829b28834 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -133,9 +133,6 @@ camel_mime_part_init (gpointer object, gpointer klass)
camel_mime_part->content_MD5 = NULL;
camel_mime_part->content_languages = NULL;
camel_mime_part->encoding = CAMEL_MIME_PART_ENCODING_DEFAULT;
-
- camel_mime_part->temp_message_buffer = NULL;
- camel_mime_part->content_input_stream = NULL;
}
@@ -150,10 +147,8 @@ camel_mime_part_finalize (CamelObject *object)
string_list_free (mime_part->content_languages);
header_disposition_unref(mime_part->disposition);
- if (mime_part->content_type) gmime_content_field_unref (mime_part->content_type);
- if (mime_part->temp_message_buffer) g_byte_array_free (mime_part->temp_message_buffer, TRUE);
-
- if (mime_part->content_input_stream) camel_object_unref (CAMEL_OBJECT (mime_part->content_input_stream));
+ if (mime_part->content_type)
+ gmime_content_field_unref (mime_part->content_type);
header_raw_clear(&mime_part->headers);
}
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index e423553318..ed0df94a4b 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -68,9 +68,7 @@ struct _CamelMimePart
GList *content_languages;
CamelMimePartEncodingType encoding;
- GByteArray *temp_message_buffer;
GMimeContentField *content_type;
- CamelStream *content_input_stream;
struct _header_raw *headers; /* mime headers */
};
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index b01d263d87..92e33228c3 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+/* dont touch this file without my permission - Michael */
+
#include <config.h>
#include <stdio.h>
@@ -1031,6 +1033,9 @@ header_decode_text (const char *in, int inlen)
}
#if 0 /* This is broken */
+
+/* so in what way is it broken? */
+
/* decodes a simple text, rfc822 */
static char *
header_decode_text(const char *in, int inlen)
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 31b5e23d93..970f622b16 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -706,10 +706,10 @@ imap_get_summary_internal (CamelFolder *folder, CamelException *ex)
}
/* construct the CamelMessageInfo */
- info->subject = camel_summary_format_string (h, "subject");
- info->from = camel_summary_format_address (h, "from");
- info->to = camel_summary_format_address (h, "to");
- info->cc = camel_summary_format_address (h, "cc");
+ info->subject = camel_folder_summary_format_string (h, "subject");
+ info->from = camel_folder_summary_format_address (h, "from");
+ info->to = camel_folder_summary_format_address (h, "to");
+ info->cc = camel_folder_summary_format_address (h, "cc");
info->user_flags = NULL;
info->date_sent = header_decode_date (header_raw_find (&h, "date", NULL), NULL);
received = header_raw_find (&h, "received", NULL);
@@ -832,10 +832,10 @@ imap_get_message_info_internal (CamelFolder *folder, guint id, CamelException *e
}
/* construct the CamelMessageInfo */
- info->subject = camel_summary_format_string (h, "subject");
- info->from = camel_summary_format_address (h, "from");
- info->to = camel_summary_format_address (h, "to");
- info->cc = camel_summary_format_address (h, "cc");
+ info->subject = camel_folder_summary_format_string (h, "subject");
+ info->from = camel_folder_summary_format_address (h, "from");
+ info->to = camel_folder_summary_format_address (h, "to");
+ info->cc = camel_folder_summary_format_address (h, "cc");
info->user_flags = NULL;
info->date_sent = header_decode_date (header_raw_find (&h, "date", NULL), NULL);
received = header_raw_find (&h, "received", NULL);