Changeset 1700

Timestamp:

03/05/07 20:48:13

Author:

pvanhoof

Message:

A few major changes

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/Makefile.am (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-full-msg-receive-strategy.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-header-priv.h (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-header.c (modified) (28 diffs)
• trunk/libtinymail-camel/tny-camel-header.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-msg-header-priv.h (added)
• trunk/libtinymail-camel/tny-camel-msg-header.c (added)
• trunk/libtinymail-camel/tny-camel-msg-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-msg.c (modified) (11 diffs)
• trunk/libtinymail-camel/tny-camel-msg.h (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c (modified) (3 diffs)
• trunk/libtinymail-gnome-desktop/tny-gnome-platform-factory.c (modified) (3 diffs)
• trunk/libtinymail-gpe/tny-gpe-platform-factory.c (modified) (3 diffs)
• trunk/libtinymail-maemo/tny-maemo-platform-factory.c (modified) (4 diffs)
• trunk/libtinymail-olpc/tny-olpc-platform-factory.c (modified) (4 diffs)
• trunk/libtinymail-test/tny-header-test.c (modified) (3 diffs)
• trunk/libtinymail-test/tny-list-test.c (modified) (1 diff)
• trunk/libtinymail-test/tny-msg-test.c (modified) (2 diffs)
• trunk/libtinymail/tny-msg.c (modified) (1 diff)
• trunk/libtinymail/tny-msg.h (modified) (2 diffs)
• trunk/libtinymailui/tny-platform-factory.c (modified) (1 diff)
• trunk/libtinymailui/tny-platform-factory.h (modified) (2 diffs)
• trunk/tests/shared/platfact.c (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-03-05  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Bugfix for ticket #26
+        * Major changes in the TnyCamelHeader type
+        * A new type called TnyCamelMsgHeader
+        * Changes in the TnyCamelFolder type
+        * API changes in the TnyPlatformFactory interface
+        * Memory consumption reduction (major ones)
+        * Split and cleanup of the TnyHeader implementations
+        * Produced patch for Modest to cope with the changes
+
+        * This was a major API change in libtinymailui and libtinymail-camel
+
-2007-03-04  Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-

trunk/libtinymail-camel/Makefile.am

@@ -54 +54 @@
-        tny-camel-msg.c \
-        tny-camel-header.c \
+        tny-camel-msg-header-priv.h \
+        tny-camel-msg-header.c \
-        tny-camel-partial-msg-receive-strategy.c \
-        tny-camel-full-msg-receive-strategy.c \

trunk/libtinymail-camel/tny-camel-folder.c

@@ -147 +147 @@
-                                priv->unread_length++;
-                        priv->cached_length++;
-
+_
-                        if (!change)
-                                change = tny_folder_change_new (TNY_FOLDER (self));
@@ -165 +165 @@
-                if (info)
-                {
-
+_
-                        priv->cached_length--;
-                        priv->unread_sync++;
@@ -1032 +1032 @@
-
-        /* TODO: Proxy instantiation (happens a lot, could use a pool) */
-
+
+
-
-        _tny_camel_header_set_folder (TNY_CAMEL_HEADER (header), TNY_CAMEL_FOLDER (self), priv);
-        _tny_camel_header_set_camel_message_info (TNY_CAMEL_HEADER (header), mi, FALSE);
-
-        /* Get rid of the reference already. I know this is ugly */
-        /* camel_folder_free_message_info (cfol, mi); */
-
-        tny_list_prepend (headers, (GObject*)header);

trunk/libtinymail-camel/tny-camel-full-msg-receive-strategy.c

@@ -29 +29 @@
-#include <tny-header.h>
-#include <tny-camel-msg.h>
-#include <tny-camel-header.h>
-
-#include <camel/camel-folder.h>
@@ -43 +42 @@
-#include "tny-camel-account-priv.h"
-#include "tny-camel-folder-priv.h"
+#include "tny-camel-msg-header-priv.h"
-
-static GObjectClass *parent_class = NULL;
@@ -77 +77 @@
-                if (camel_message && CAMEL_IS_OBJECT (camel_message))
-                {
-
-
+
-                        message = tny_camel_msg_new ();
-                        _tny_camel_msg_set_folder (TNY_CAMEL_MSG (message), folder);
+                        _tny_camel_msg_set_header (TNY_CAMEL_MSG (message), nheader);
-                        _tny_camel_mime_part_set_part (TNY_CAMEL_MIME_PART (message), 
-
-
-
+
-                        g_object_unref (G_OBJECT (nheader));
-                }

trunk/libtinymail-camel/tny-camel-header-priv.h

@@ -21 +21 @@
- */
-
+#include <glib.h>
+#include <glib-object.h>
+#include <tny-header.h>
+
-#include <camel/camel.h>
-#include <camel/camel-folder-summary.h>
@@ -27 +31 @@
-#include "tny-camel-folder-priv.h"
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -39 +49 @@
-{
-        GObject parent;
-gpointer 
+CamelMessageInfo *
-        TnyCamelFolder *folder;
-        guchar write:2;
-};
-
@@ -49 +58 @@
-};
-
+GType tny_camel_header_get_type (void);
+TnyHeader* _tny_camel_header_new (void);
+
-void _tny_camel_header_set_camel_message_info (TnyCamelHeader *self, CamelMessageInfo *camel_message_info, gboolean knowit);
-void _tny_camel_header_set_folder (TnyCamelHeader *self, TnyCamelFolder *folder, TnyCamelFolderPriv *tpriv);
-void _tny_camel_header_set_camel_mime_message (TnyCamelHeader *self, CamelMimeMessage *camel_mime_message);
-void _tny_camel_header_set_as_memory (TnyCamelHeader *self, CamelMessageInfo *camel_message_info);
-
+G_END_DECLS
+
-#endif
+

trunk/libtinymail-camel/tny-camel-header.c

@@ -42 +42 @@
-static GObjectClass *parent_class = NULL;
-
-static void 
-unref_info (TnyCamelHeader *self)
-{
-        if (self->info && self->write == 0)
-                camel_message_info_free (self->info);
-}
-
-static void 
-destroy_write (TnyCamelHeader *self)
-{
-        /* Also check out tny-msg.c: tny_msg_finalize (read the stupid hack) */
-        if (((WriteInfo*)self->info)->msg)
-                camel_object_unref (CAMEL_OBJECT (((WriteInfo*)self->info)->msg));
-
-        if (((WriteInfo*)self->info)->mime_from && ((WriteInfo*)self->info)->mime_from != NULL)
-                g_free (((WriteInfo*)self->info)->mime_from);
-
-        g_slice_free (WriteInfo, self->info);
-        self->info = NULL;
-        self->write = 3;
-}
-
-static void 
-destroy_mem (TnyCamelHeader *self)
-{
-        if (self->info)
-                camel_message_info_free ((CamelMessageInfo*) self->info);
-        self->info = NULL;
-        self->write = 3;
-}
-
-
-static void
-prepare_for_write (TnyCamelHeader *self)
-{
-        if (self->write != 1)
-        {
-                self->info = g_slice_new0 (WriteInfo);
-                ((WriteInfo*)self->info)->msg = camel_mime_message_new ();
-                ((WriteInfo*)self->info)->mime_from = NULL;
-                self->write = 1;
-        } 
-
-        return;
-}
-
-void 
@@ -94 +49 @@
-                g_warning ("Strange behaviour: Overwriting existing message info");
-
-
-
-
-
-
-
+
+
-
-        camel_message_info_ref (camel_message_info);
-
-        self->info = camel_message_info;
-        self->write = 0;
-
-        return;
@@ -115 +64 @@
-                g_warning ("Strange behaviour: Overwriting existing message info");
-
-
-
-
-
-
-
+
+
-
-        self->info = info;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-static const gchar*
-tny_camel_header_get_replyto (TnyHeader *self)
@@ -157 +79 @@
-        const gchar *retval = NULL;
-
-        if (G_UNLIKELY (!me->info))
-                return NULL;
-
-        if (G_UNLIKELY (me->write == 1)) 
-        {
-                CamelInternetAddress *addr = (CamelInternetAddress*)
-                        camel_mime_message_get_reply_to (((WriteInfo*)me->info)->msg);
-                if (addr)
-                        retval = camel_address_format (CAMEL_ADDRESS (addr));
-        }
-
-        return retval;
-}
@@ -175 +86 @@
-tny_camel_header_set_bcc (TnyHeader *self, const gchar *bcc)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return;
-}
@@ -196 +93 @@
-tny_camel_header_set_cc (TnyHeader *self, const gchar *cc)
-{
-
-
-
-
-
-
-
-
-
-
-
+
-        return;
-}
@@ -213 +100 @@
-tny_camel_header_set_from (TnyHeader *self, const gchar *from)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return;
-}
@@ -232 +107 @@
-tny_camel_header_set_subject (TnyHeader *self, const gchar *subject)
-{
-
-
-
-
+
-        return;
-}
@@ -242 +114 @@
-tny_camel_header_set_to (TnyHeader *self, const gchar *to)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return;
-}
@@ -264 +122 @@
-tny_camel_header_set_replyto (TnyHeader *self, const gchar *replyto)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return;
-}
@@ -288 +133 @@
-        const gchar *retval = NULL;
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -302 +141 @@
-tny_camel_header_get_bcc (TnyHeader *self)
-{
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -320 +151 @@
-        TnyHeaderFlags retval = 0;
-
-        if (G_UNLIKELY (me->write == 1))
-        {
-                g_warning ("tny_camel_header_get_flags: This is a header for a new message!\n");
-                return retval;
-        }
-
-        /* This is only legal because the flags between CamelLite and Tinymail are equalized */
-(CamelMessageInfo*)
+
-
-        return retval;
@@ -337 +162 @@
-        TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
-
-        if (G_UNLIKELY (me->write == 1))
-        {
-                g_warning ("tny_camel_header_get_flags: This is a header for a new message!\n");
-                return;
-        } 
-
-        /* This is only legal because the flags between CamelLite and Tinymail are equalized */
-(CamelMessageInfo*)
+
-
-        return;
@@ -354 +173 @@
-        TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
-
-
-
-
-
-
-
-
+
-
-        return;
@@ -371 +184 @@
-        time_t retval = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -402 +195 @@
-        time_t retval = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -432 +206 @@
-        const gchar *retval = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -459 +217 @@
-        const gchar *retval = NULL;
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -477 +229 @@
-        const gchar *retval = NULL;
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -494 +240 @@
-        const gchar *retval = NULL;
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -513 +253 @@
-        guint retval;
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        return retval;
@@ -536 +266 @@
-        const gchar *retval = NULL;
-
-
-
-
-
+
-
-        return retval;
@@ -549 +276 @@
-        TnyCamelHeader *self = (TnyCamelHeader*) object;
-
-
-
-
-
-
-
+
+
-
-        if (self->folder)
@@ -563 +286 @@
-        }
-
-        /* Normally we do camel_folder_free_message_info here, but we already got
-        rid of our initial reference at tny-folder.c:add_message_with_uid
-        I know this is actually ugly */
-
-        (*parent_class->finalize) (object);
-
@@ -572 +291 @@
-}
-
-/**
- * tny_camel_header_new:
- *
- *
- * Return value: A new #TnyHeader instance implemented for Camel
- **/
-TnyHeader*
-
+_
-{
-        TnyCamelHeader *self = g_object_new (TNY_TYPE_CAMEL_HEADER, NULL);
-
+
-        self->info = NULL;
-write = 3
-
-
+folder = NULL
+
+ 
-}
-
@@ -594 +307 @@
-        TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
-        fpriv->headers_managed++;
-
+ 
-
-        return;
@@ -607 +320 @@
-                g_object_ref (G_OBJECT (me->folder));
-
-
+ 
-}
-

trunk/libtinymail-camel/tny-camel-header.h

@@ -1 @@
-#ifndef TNY_CAMEL_HEADER_H
-#define TNY_CAMEL_HEADER_H
-
-/* libtinymail-camel - The Tiny Mail base library for Camel
- * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with self library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <tny-header.h>
-
-G_BEGIN_DECLS
-
-#define TNY_TYPE_CAMEL_HEADER             (tny_camel_header_get_type ())
-#define TNY_CAMEL_HEADER(obj)             ((TnyCamelHeader*)obj)
-/* #define TNY_CAMEL_HEADER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_CAMEL_HEADER, TnyCamelHeader)) */
-#define TNY_CAMEL_HEADER_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_CAMEL_HEADER, TnyCamelHeaderClass))
-#define TNY_IS_CAMEL_HEADER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_CAMEL_HEADER))
-#define TNY_IS_CAMEL_HEADER_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_CAMEL_HEADER))
-#define TNY_CAMEL_HEADER_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_CAMEL_HEADER, TnyCamelHeaderClass))
-
-typedef struct _TnyCamelHeader TnyCamelHeader;
-typedef struct _TnyCamelHeaderClass TnyCamelHeaderClass;
-
-
-GType tny_camel_header_get_type (void);
-TnyHeader* tny_camel_header_new (void);
-
-
-G_END_DECLS
-
-#endif

trunk/libtinymail-camel/tny-camel-mime-part.c

@@ -31 +31 @@
-#include <tny-camel-shared.h>
-#include <tny-list.h>
-#include <tny-camel-header.h>
-#include <tny-camel-msg.h>
-
@@ -37 +36 @@
-
-#include "tny-camel-mime-part-priv.h"
+#include "tny-camel-msg-header-priv.h"
-
-#include <camel/camel-url.h>
@@ -119 +119 @@
-                        if (camel_content_type_is (type, "message", "rfc822"))
-                        {
-                                TnyCamelHeader *nheader = TNY_CAMEL_HEADER (tny_camel_header_new ());
-                                CamelDataWrapper *c = camel_medium_get_content_object (CAMEL_MEDIUM (tpart));
-                        
-                                if (c) 
-                                {
+                                        TnyHeader *nheader = _tny_camel_msg_header_new (CAMEL_MIME_MESSAGE (c), NULL);
-                                        newpart = TNY_MIME_PART (tny_camel_msg_new ());
-                                        _tny_camel_header_set_camel_mime_message (nheader, CAMEL_MIME_MESSAGE (c));
-                                        _tny_camel_msg_set_header (TNY_CAMEL_MSG (newpart), nheader);
-                                        _tny_camel_mime_part_set_part (TNY_CAMEL_MIME_PART (newpart), CAMEL_MIME_PART (c));

trunk/libtinymail-camel/tny-camel-msg-priv.h

@@ -30 +30 @@
-        GMutex *message_lock;
-        GMutex *header_lock;
-        TnyHeader *header;
-        GMutex *parts_lock;
-        GMutex *folder_lock;
-        TnyFolder *folder;
+        TnyHeader *header;
-};
-
-CamelMimeMessage* _tny_camel_msg_get_camel_mime_message (TnyCamelMsg *self);
-void _tny_camel_msg_set_folder (TnyCamelMsg *self, TnyFolder *folder);
-Camel
+
-
-#endif

trunk/libtinymail-camel/tny-camel-msg.c

@@ -43 +43 @@
-#include "tny-camel-msg-priv.h"
-#include "tny-camel-mime-part-priv.h"
-
+msg-
-
-#define TNY_CAMEL_MSG_GET_PRIVATE(o)    \
@@ -63 +63 @@
-
-
-
-static TnyFolder* 
-tny_camel_msg_get_folder (TnyMsg *self)
@@ -78 +77 @@
-        g_mutex_lock (priv->folder_lock);
-        retval = priv->folder;
-
+
+
-        g_mutex_unlock (priv->folder_lock);
-
@@ -107 +107 @@
-}
-
+void 
+_tny_camel_msg_set_header (TnyCamelMsg *self, TnyHeader *header)
+{
+        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self);
+        g_mutex_lock (priv->header_lock);
+        priv->header = TNY_HEADER (g_object_ref (G_OBJECT (header)));
+        g_mutex_unlock (priv->header_lock);
+        return;
+}
+
-static TnyHeader*
-tny_camel_msg_get_header_default (TnyMsg *self)
@@ -114 +124 @@
-
-        g_mutex_lock (priv->header_lock);
-
-
-
-
+
+
+
-                CamelMimeMessage *msg;
-                priv->header = tny_camel_header_new ();
-                msg = _tny_camel_msg_get_camel_mime_message (TNY_CAMEL_MSG (self));
-
-
-
+
+
-        }
+
+        retval = TNY_HEADER (g_object_ref (G_OBJECT (priv->header)));
+
-        g_mutex_unlock (priv->header_lock);
-
-        return retval;
-}
-
-
-
-void
-_tny_camel_msg_set_header (TnyCamelMsg *self, TnyCamelHeader *header)
-{
-        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self);
-        g_mutex_lock (priv->header_lock);
-
-        if (priv->header)
-                g_object_unref (G_OBJECT (priv->header));
-
-        g_object_ref (G_OBJECT (header));
-        priv->header = TNY_HEADER (header);
-        g_mutex_unlock (priv->header_lock);
-        return;
-}
-
-static void
-tny_camel_msg_set_header (TnyMsg *self, TnyHeader *header)
-{
-        TNY_CAMEL_MSG_GET_CLASS (self)->set_header_func (self, header);
-        return;
-}
-
-static void
-tny_camel_msg_set_header_default (TnyMsg *self, TnyHeader *header)
-{
-        CamelMimeMessage *msg;
-        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self);
-        /* CamelInternetAddress *from, *recipients, *replyto;
-        const gchar *str; */
-
-        g_assert (TNY_IS_CAMEL_HEADER (header));
-
-        g_mutex_lock (priv->header_lock);
-
-        if (priv->header)
-                g_object_unref (G_OBJECT (priv->header));
-        g_object_ref (G_OBJECT (header));
-
-        priv->header = header;
-
-        if (((TnyCamelHeader *)header)->write == 1)
-        {
-                TnyCamelMimePartPriv *ppriv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
-                g_mutex_lock (ppriv->part_lock);
-                if (ppriv->part) 
-                {
-                        /* TODO: copy old part over? */
-                        camel_object_unref (CAMEL_OBJECT (ppriv->part));
-                }
-                /* Add a reference? */
-                ppriv->part = (CamelMimePart *) ((WriteInfo*)((TnyCamelHeader *)header)->info)->msg;
-                g_mutex_unlock (ppriv->part_lock);
-        } else {
-                msg = _tny_camel_msg_get_camel_mime_message (TNY_CAMEL_MSG (self));
-                _tny_camel_header_set_camel_mime_message 
-                        (TNY_CAMEL_HEADER (priv->header), msg);
-        }
-
-/*
-        from = camel_internet_address_new ();
-        str = tny_header_get_from (header);
-        _foreach_email_add_to_inet_addr (str, from);
-        camel_mime_message_set_from (msg, from);
-        camel_object_unref (CAMEL_OBJECT (from));
-
-        replyto = camel_internet_address_new ();
-        str = tny_header_get_replyto (header);
-        _foreach_email_add_to_inet_addr (str, replyto);
-        camel_mime_message_set_from (msg, replyto);
-        camel_object_unref (CAMEL_OBJECT (replyto));
-
-        recipients = camel_internet_address_new ();
-        str = tny_header_get_to (header);
-        _foreach_email_add_to_inet_addr (str, recipients);
-        camel_mime_message_set_recipients (msg, CAMEL_RECIPIENT_TYPE_TO, recipients);
-        camel_object_unref (CAMEL_OBJECT (recipients));
-
-        str = tny_header_get_cc (header);
-        _foreach_email_add_to_inet_addr (str, recipients);