aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camel/ChangeLog21
-rw-r--r--camel/camel-mime-filter-from.c15
-rw-r--r--camel/camel-mime-filter-from.h4
-rw-r--r--camel/camel-vee-store.c12
-rw-r--r--camel/camel-vee-store.h1
-rw-r--r--camel/providers/local/camel-mbox-summary.c10
-rw-r--r--camel/providers/local/camel-mbox-summary.h2
-rw-r--r--camel/providers/local/camel-spool-summary.c10
-rw-r--r--camel/providers/local/camel-spool-summary.h3
-rw-r--r--camel/providers/sendmail/camel-sendmail-transport.c11
10 files changed, 43 insertions, 46 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d71a3f3cba..85b6c9a7bc 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,24 @@
+2003-03-06 Jeffrey Stedfast <fejj@ximian.com>
+
+ Fixes for bug #39168
+
+ * providers/local/camel-spool-summary.c: Get rid of the empty
+ private struct.
+
+ * providers/local/camel-mbox-summary.c: Get rid of the empty
+ private struct.
+
+ * camel-vee-store.c: Get rid of the empty private struct.
+
+ * camel-mime-filter-from.c: Get rid of the empty private struct.
+
+2003-03-05 Jeffrey Stedfast <fejj@ximian.com>
+
+ * providers/sendmail/camel-sendmail-transport.c
+ (sendmail_send_to): Add a CRLF filter to the output stream to
+ convert any CRLF sequences into plain old line-feeds to work
+ around a bug in some local transport programs.
+
2003-03-04 Jeffrey Stedfast <fejj@ximian.com>
* camel-object.h: s/class/klass in one place so that the header is
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
index fb2029f909..092f4d3904 100644
--- a/camel/camel-mime-filter-from.c
+++ b/camel/camel-mime-filter-from.c
@@ -19,16 +19,16 @@
* Boston, MA 02111-1307, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include "camel-mime-filter-from.h"
#define d(x)
-struct _CamelMimeFilterFromPrivate {
-};
-
-#define _PRIVATE(o) (((CamelMimeFilterFrom *)(o))->priv)
-
static void camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass);
static void camel_mime_filter_from_init (CamelMimeFilterFrom *obj);
@@ -165,10 +165,7 @@ camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass)
static void
camel_mime_filter_from_init (CamelMimeFilterFrom *obj)
{
- struct _CamelMimeFilterFromPrivate *p;
-
- p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
- obj->midline = FALSE;
+ ;
}
/**
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index cbc2e70a94..b8f1bb9a4e 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -39,9 +39,7 @@ typedef struct _CamelMimeFilterFromClass CamelMimeFilterFromClass;
struct _CamelMimeFilterFrom {
CamelMimeFilter parent;
-
- struct _CamelMimeFilterFromPrivate *priv;
-
+
int midline; /* are we between lines? */
};
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index 9531d49fc0..46cbd45415 100644
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -40,11 +40,6 @@ static CamelFolder *vee_get_trash (CamelStore *store, CamelException *ex);
static CamelFolderInfo *vee_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelException *ex);
-struct _CamelVeeStorePrivate {
-};
-
-#define _PRIVATE(o) (((CamelVeeStore *)(o))->priv)
-
static void camel_vee_store_class_init (CamelVeeStoreClass *klass);
static void camel_vee_store_init (CamelVeeStore *obj);
static void camel_vee_store_finalise (CamelObject *obj);
@@ -90,21 +85,16 @@ camel_vee_store_class_init (CamelVeeStoreClass *klass)
static void
camel_vee_store_init (CamelVeeStore *obj)
{
- struct _CamelVeeStorePrivate *p;
CamelStore *store = (CamelStore *)obj;
/* we dont want a vtrash on this one */
store->flags &= ~(CAMEL_STORE_VTRASH);
-
- p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
}
static void
camel_vee_store_finalise (CamelObject *obj)
{
- CamelVeeStore *vs = (CamelVeeStore *)obj;
-
- g_free(vs->priv);
+ ;
}
/**
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index b7309c33c5..d0352046be 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -44,7 +44,6 @@ typedef struct _CamelVeeStoreClass CamelVeeStoreClass;
struct _CamelVeeStore {
CamelStore parent;
- struct _CamelVeeStorePrivate *priv;
};
struct _CamelVeeStoreClass {
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 41ebe28fa6..42d26e8a5b 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -46,11 +46,6 @@
#define CAMEL_MBOX_SUMMARY_VERSION (0x1000)
-struct _CamelMboxSummaryPrivate {
-};
-
-#define _PRIVATE(o) (((CamelMboxSummary *)(o))->priv)
-
static int summary_header_load (CamelFolderSummary *, FILE *);
static int summary_header_save (CamelFolderSummary *, FILE *);
@@ -132,11 +127,8 @@ camel_mbox_summary_class_init(CamelMboxSummaryClass *klass)
static void
camel_mbox_summary_init(CamelMboxSummary *obj)
{
- struct _CamelMboxSummaryPrivate *p;
struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
- p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
+
/* subclasses need to set the right instance data sizes */
s->message_info_size = sizeof(CamelMboxMessageInfo);
s->content_info_size = sizeof(CamelMboxMessageContentInfo);
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
index 13c5f1c027..0588a9a81b 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-summary.h
@@ -46,8 +46,6 @@ typedef struct _CamelMboxMessageInfo {
struct _CamelMboxSummary {
CamelLocalSummary parent;
- struct _CamelMboxSummaryPrivate *priv;
-
CamelFolderChangeInfo *changes; /* used to build change sets */
size_t folder_size; /* size of the mbox file, last sync */
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index d914af87e2..7991a881cc 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -44,11 +44,6 @@
#define CAMEL_SPOOL_SUMMARY_VERSION (0x400)
-struct _CamelSpoolSummaryPrivate {
-};
-
-#define _PRIVATE(o) (((CamelSpoolSummary *)(o))->priv)
-
static int spool_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);
static int spool_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);
@@ -95,11 +90,8 @@ camel_spool_summary_class_init(CamelSpoolSummaryClass *klass)
static void
camel_spool_summary_init(CamelSpoolSummary *obj)
{
- struct _CamelSpoolSummaryPrivate *p;
struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
- p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
+
/* message info size is from mbox parent */
/* and a unique file version */
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index ac846220f4..eda6e64fab 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -36,8 +36,7 @@ typedef struct _CamelSpoolSummaryClass CamelSpoolSummaryClass;
struct _CamelSpoolSummary {
CamelMboxSummary parent;
-
- struct _CamelSpoolSummaryPrivate *priv;
+
};
struct _CamelSpoolSummaryClass {
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index 7ba567832b..f7059198b0 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -34,6 +34,8 @@
#include <string.h>
#include "camel-sendmail-transport.h"
+#include "camel-mime-filter-crlf.h"
+#include "camel-stream-filter.h"
#include "camel-mime-message.h"
#include "camel-data-wrapper.h"
#include "camel-stream-fs.h"
@@ -88,6 +90,8 @@ sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message,
struct _header_raw *header, *savedbcc, *n, *tail;
const char *from_addr, *addr, **argv;
int i, len, fd[2], nullfd, wstat;
+ CamelStreamFilter *filter;
+ CamelMimeFilter *crlf;
sigset_t mask, omask;
CamelStream *out;
pid_t pid;
@@ -185,6 +189,13 @@ sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message,
/* Parent process. Write the message out. */
close (fd[0]);
out = camel_stream_fs_new_with_fd (fd[1]);
+ filter = camel_stream_filter_new_with_stream (out);
+ crlf = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
+ camel_stream_filter_add (filter, crlf);
+ camel_object_unref (crlf);
+ camel_object_unref (out);
+
+ out = (CamelStream *) filter;
if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), out) == -1
|| camel_stream_close (out) == -1) {
camel_object_unref (CAMEL_OBJECT (out));
generated by cgit (git 2.34.1) at 2024-11-18 23:40:54 +0800