Changeset 212

Timestamp:

05/03/06 12:08:06

Author:

pvanhoof

Message:

Memory and loading improvements

Files:

• trunk/libtinymail-camel/tny-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-stream.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-msg-folder-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-msg-folder.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-msg-header.c (modified) (23 diffs)
• trunk/libtinymail-camel/tny-msg-mime-part.c (modified) (7 diffs)
• trunk/libtinymail-camel/tny-msg.c (modified) (12 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-store-account.c (modified) (13 diffs)
• trunk/libtinymail-camel/tny-stream-camel.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-transport-account.c (modified) (2 diffs)
• trunk/libtinymail-gnomevfs/tny-vfs-stream.c (modified) (7 diffs)
• trunk/libtinymail/tny-account-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-account-store-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-msg-folder-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-msg-header-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-msg-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-msg-mime-part-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)
• trunk/libtinymail/tny-store-account-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-stream-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-transport-account-iface.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-account-tree-model.c (modified) (3 diffs)
• trunk/libtinymailui-gtk/tny-attach-list-model.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-msg-header-list-model.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-msg-view.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-msg-window.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-text-buffer-stream.c (modified) (1 diff)
• trunk/libtinymailui/tny-msg-view-iface.c (modified) (1 diff)
• trunk/libtinymailui/tny-msg-window-iface.c (modified) (1 diff)
• trunk/libtinymailui/tny-summary-window-iface.c (modified) (1 diff)
• trunk/tinymail/tny-account-store.c (modified) (1 diff)
• trunk/tinymail/tny-password-dialog.c (modified) (1 diff)
• trunk/tinymail/tny-summary-window.c (modified) (1 diff)

trunk/libtinymail-camel/tny-account.c

@@ -394 +394 @@
-        static GType type = 0;
-
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -400 +400 @@
-        }
-
-type == 0) 
+G_UNLIKELY(type == 0))
-        {
-                static const GTypeInfo info = 

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

@@ -150 +150 @@
-        static CamelType type = CAMEL_INVALID_TYPE;
-        
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -156 +156 @@
-        }
-
-
+
+
-                parent_class = (CamelStreamClass *)camel_stream_get_type();
-                type = camel_type_register ((CamelType)parent_class,

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

@@ -55 +55 @@
-
-void _tny_msg_folder_set_subscribed_priv (TnyMsgFolderIface *self, gboolean subscribed);
+void _tny_msg_folder_set_name_priv (TnyMsgFolderIface *self, const gchar *name);
-
-#endif

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

@@ -498 +498 @@
-        const gchar *name = NULL;
-        
-        load_folder (priv);
-
-        if (!priv->cached_name)
+        {
+                load_folder (priv);
-                name = camel_folder_get_name (priv->folder);
-
+} 
-                name = priv->cached_name;
-
@@ -525 +525 @@
-
-        priv->folder_name = g_strdup (id);
+
+        return;
+}
+
+
+void
+_tny_msg_folder_set_name_priv (TnyMsgFolderIface *self, const gchar *name)
+{
+        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (TNY_MSG_FOLDER (self));
+
+        if (priv->cached_name)
+                g_free (priv->cached_name);
+
+        priv->cached_name = g_strdup (name);
-
-        return;
@@ -774 +788 @@
-        static GType type = 0;
-
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -780 +794 @@
-        }
-
-type == 0) 
+G_UNLIKELY(type == 0))
-        {
-                static const GTypeInfo info = 

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

@@ -66 +66 @@
-unload_msg_header (TnyMsgHeader *self)
-{
-!self->uncachable
+G_UNLIKELY (!self->uncachable)
-                return;
-
-
+
+
-                g_free (self->mime_from);
-
-
-
+
+
+
+
-        {
-
+
+
-                        camel_message_info_free (self->message_info);
-
+
+
-        } else {
-self->mime_message && CAMEL_IS_OBJECT (self->mime_message
-
+G_LIKELY (self->mime_message) && G_LIKELY (CAMEL_IS_OBJECT (self->mime_message)
+        
-                self->mime_message = NULL;
-        }
@@ -101 +105 @@
-load_msg_header (TnyMsgHeader *self)
-{
-!self->uncachable
+G_UNLIKELY (!self->uncachable)
-                return;
-
-self->use_summary
+G_LIKELY (self->use_summary)
-        {
-!self->message_info && self->folder && self->uid
+G_LIKELY (!self->message_info) && G_LIKELY (self->folder) && G_LIKELY (self->uid)
-                {
-                        CamelFolder *folder = _tny_msg_folder_get_camel_folder (self->folder);
@@ -113 +117 @@
-                        _tny_msg_header_set_camel_message_info (self, msginfo);
-                }
-
-
-
+
+
-                {
-                        CamelFolder *folder = _tny_msg_folder_get_camel_folder (self->folder);
@@ -134 +137 @@
-        self->use_summary = FALSE;
-
-!self->mime_message
+G_LIKELY (!self->mime_message)
-                self->mime_message = camel_mime_message_new ();
-
@@ -146 +149 @@
-{
-
-self->message_info
+G_UNLIKELY (self->message_info)
-                g_warning ("Strange behaviour: Overwriting existing message info");
-
@@ -168 +171 @@
-{
-
-self->mime_message
+G_UNLIKELY (self->mime_message)
-                g_warning ("Strange behaviour: Overwriting existing MIME message");
-
@@ -195 +198 @@
-        TnyMsgHeader *me = TNY_MSG_HEADER (self);
-
-
-
+
-                g_warning ("Strange behaviour: Overwriting existing folder");
-
+        g_mutex_lock (me->hdr_lock);
-        me->folder = (TnyMsgFolderIface*)folder;
-        g_mutex_unlock (me->hdr_lock);
@@ -358 +361 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_cc (me->message_info);
-me->mime_message
+G_LIKELY (me->mime_message)
-                retval = camel_medium_get_header (CAMEL_MEDIUM (me->mime_message), "cc");
-
-!retval
+G_UNLIKELY (!retval)
-                retval = me->invalid;
-
@@ -382 +385 @@
-        load_msg_header (me);
-
-me->use_summary
+G_LIKELY (me->use_summary)
-                retval = me->invalid;
-me->mime_message
+G_LIKELY (me->mime_message)
-                retval = camel_medium_get_header (CAMEL_MEDIUM (me->mime_message), "bcc");
-
-!retval
+G_UNLIKELY (!retval)
-                retval = me->invalid;
-
@@ -406 +409 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_date_received (me->message_info);
-me->mime_message
+G_LIKELY (me->mime_message)
-                retval = camel_mime_message_get_date_received (me->mime_message, NULL);
-
@@ -427 +430 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_date_sent (me->message_info);
-        else {
@@ -449 +452 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_from (me->message_info);
-        else
-        {
-!me->mime_from && me->mime_message
+G_LIKELY (!me->mime_from) && G_LIKELY (me->mime_message)
-                {
-                        CamelInternetAddress *addr = (CamelInternetAddress*)
@@ -464 +467 @@
-        }
-
-!retval
+G_UNLIKELY (!retval)
-                retval = me->invalid;
-
@@ -482 +485 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_subject (me->message_info);
-me->mime_message
+G_LIKELY (me->mime_message)
-                retval = camel_mime_message_get_subject (me->mime_message);
-
-!retval
+G_UNLIKELY (!retval)
-                retval = me->invalid;
-
@@ -507 +510 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_to (me->message_info);
-me->mime_message
+G_LIKELY (me->mime_message)
-                retval = camel_medium_get_header (CAMEL_MEDIUM (me->mime_message), "to");
-
-!retval
+G_UNLIKELY (!retval)
-                retval = me->invalid;
-
@@ -531 +534 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = (const gchar*)camel_message_info_message_id (me->message_info);
-me->mime_message
+G_LIKELY (me->mime_message)
-                retval = camel_mime_message_get_message_id (me->mime_message);
-
-!retval
+G_UNLIKELY (!retval)
-                retval = me->invalid;
-
@@ -557 +560 @@
-        load_msg_header (me);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                retval = camel_message_info_uid (me->message_info);
-        else /* Bleh solution ... */
@@ -583 +586 @@
-        /* Yes I know what I'm doing, also check tny-msg-folder.c */
-
-me->use_summary) 
+G_LIKELY (me->use_summary))
-                me->uid = (gchar*)uid;
-        else {
@@ -611 +614 @@
-        g_mutex_lock (me->hdr_lock);
-
-me->use_summary
+G_LIKELY (me->use_summary)
-                retval = (me->message_info != NULL);
-        else
@@ -628 +631 @@
-        g_mutex_lock (me->hdr_lock);
-
-me->use_summary && me->message_info
+G_LIKELY (me->use_summary) && G_LIKELY (me->message_info)
-                unload_msg_header (me);
-
-!me->use_summary && me->mime_message
+G_UNLIKELY (!me->use_summary) && G_LIKELY (me->mime_message)
-                unload_msg_header (me);
-
@@ -650 +653 @@
-        self->uncachable = TRUE;
-
-self->use_summary && self->message_info
+G_LIKELY (self->use_summary) && G_LIKELY (self->message_info)
-                unload_msg_header (self);
-
-!self->use_summary && self->mime_message
+G_UNLIKELY (!self->use_summary) && G_LIKELY (self->mime_message)
-                unload_msg_header (self);
-
-        /* Indeed, check the speedup trick above */
-self->uid && !self->use_summary
+G_LIKELY (self->uid) && G_UNLIKELY (!self->use_summary)
-                g_free (self->uid); /* Also check above */
-
@@ -744 +747 @@
-        static GType type = 0;
-
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -750 +753 @@
-        }
-
-type == 0) 
+G_UNLIKELY(type == 0))
-        {
-                static const GTypeInfo info = 

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

@@ -50 +50 @@
-        wrapper = camel_medium_get_content_object (medium);
-
-!wrapper
+G_UNLIKELY (!wrapper)
-        {
-                g_error ("Mime part does not yet have a source stream, use "
@@ -89 +89 @@
-        wrapper = camel_medium_get_content_object (medium);
-
-wrapper
+G_LIKELY (wrapper)
-                camel_object_unref (CAMEL_OBJECT (wrapper));
-
@@ -121 +121 @@
-        wrapper = camel_medium_get_content_object (medium);
-
-!wrapper
+G_UNLIKELY (!wrapper)
-        {
-                wrapper = camel_data_wrapper_new (); 
@@ -145 +145 @@
-        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
-
-!priv->cached_content_type
+G_LIKELY (!priv->cached_content_type)
-        {
-                CamelContentType *type;
@@ -199 +199 @@
-        g_mutex_lock (priv->part_lock);
-
+        if (G_UNLIKELY (priv->cached_content_type))
+                g_free (priv->cached_content_type);
+        priv->cached_content_type = NULL;
+        if (G_UNLIKELY (priv->part))
+                camel_object_unref (CAMEL_OBJECT (priv->part));
+        camel_object_ref (CAMEL_OBJECT (part));
+        priv->part = part;
+
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+CamelMimePart*
+tny_msg_mime_part_get_part (TnyMsgMimePart *self)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+        CamelMimePart *retval;
+
+        g_mutex_lock (priv->part_lock);
+        retval = priv->part;
+        g_mutex_unlock (priv->part_lock);
+
+        return retval;
+}
+
+
+static const gchar*
+tny_msg_mime_part_get_filename (TnyMsgMimePartIface *self)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+        const gchar *retval;
+
+        g_mutex_lock (priv->part_lock);
+        retval = camel_mime_part_get_filename (priv->part);
+        g_mutex_unlock (priv->part_lock);
+        
+        return retval;
+}
+
+static const gchar*
+tny_msg_mime_part_get_content_id (TnyMsgMimePartIface *self)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+        const gchar *retval;
+
+        g_mutex_lock (priv->part_lock);
+        retval = camel_mime_part_get_content_id (priv->part);
+        g_mutex_unlock (priv->part_lock);
+
+        return retval;
+}
+
+static const gchar*
+tny_msg_mime_part_get_description (TnyMsgMimePartIface *self)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+        const gchar *retval;
+
+        g_mutex_lock (priv->part_lock);
+        retval = camel_mime_part_get_description (priv->part);
+        g_mutex_unlock (priv->part_lock);
+
+        return retval;
+}
+
+static const gchar*
+tny_msg_mime_part_get_content_location (TnyMsgMimePartIface *self)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+        const gchar *retval;
+
+        g_mutex_lock (priv->part_lock);
+        retval = camel_mime_part_get_content_location (priv->part);
+        g_mutex_unlock (priv->part_lock);
+
+        return retval;
+}
+
+
+static void 
+tny_msg_mime_part_set_content_location (TnyMsgMimePartIface *self, const gchar *content_location)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->part_lock);
+        camel_mime_part_set_content_location (priv->part, content_location);
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+static void 
+tny_msg_mime_part_set_description (TnyMsgMimePartIface *self, const gchar *description)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->part_lock);
+        camel_mime_part_set_description (priv->part, description);
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+static void 
+tny_msg_mime_part_set_content_id (TnyMsgMimePartIface *self, const gchar *content_id)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->part_lock);
+        camel_mime_part_set_content_id (priv->part, content_id);
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+static void 
+tny_msg_mime_part_set_filename (TnyMsgMimePartIface *self, const gchar *filename)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->part_lock);
+        camel_mime_part_set_filename (priv->part, filename);
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+static void 
+tny_msg_mime_part_set_content_type (TnyMsgMimePartIface *self, const gchar *content_type)
+{
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->part_lock);
+
+        camel_mime_part_set_content_type (priv->part, content_type);
+        if (G_UNLIKELY (priv->cached_content_type))
+                g_free (priv->cached_content_type);
+        priv->cached_content_type = NULL;
+
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+static void
+tny_msg_mime_part_finalize (GObject *object)
+{
+        TnyMsgMimePart *self = (TnyMsgMimePart*) object;
+        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->part_lock);
-        if (priv->cached_content_type)
-                g_free (priv->cached_content_type);
-        priv->cached_content_type = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        {
-                g_mutex_lock (priv->part_lock);
@@ -446 +446 @@
-        static GType type = 0;
-
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -452 +452 @@
-        }
-
-type == 0) 
+G_UNLIKELY(type == 0))
-        {
-                static const GTypeInfo info = 

trunk/libtinymail-camel/tny-msg.c

@@ -55 +55 @@
-        containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-
-containee == NULL
+G_UNLIKELY (containee == NULL)
-                return go;
-
-CAMEL_IS_MULTIPART (containee)) 
+G_LIKELY (CAMEL_IS_MULTIPART (containee)))
-        {
-                parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
@@ -67 +67 @@
-                }
-
-CAMEL_IS_MIME_MESSAGE (containee)) 
+G_LIKELY (CAMEL_IS_MIME_MESSAGE (containee)))
-        {
-                go = message_foreach_part_rec (msg, (CamelMimePart *)containee, callback, data);
@@ -94 +94 @@
-destroy_part (gpointer data, gpointer user_data)
-{
-data
+G_LIKELY (data)
-                g_object_unref (G_OBJECT (data));
-
@@ -105 +105 @@
-        g_mutex_lock (priv->parts_lock);
-
-priv->parts) 
+G_LIKELY (priv->parts))
-        {
-                g_list_foreach (priv->parts, 
@@ -136 +136 @@
-        g_mutex_lock (priv->message_lock);
-
-ppriv->part
+G_LIKELY (ppriv->part)
-                camel_object_unref (CAMEL_OBJECT (ppriv->part));
-
@@ -222 +222 @@
-
-        /* Warp it into a multipart */
-!containee || !CAMEL_IS_MULTIPART (containee
+G_UNLIKELY (!containee) || G_LIKELY (!CAMEL_IS_MULTIPART (containee)
-        {
-                /* TODO: restore original mime part? */
-containee
+G_LIKELY (containee)
-                        camel_object_unref (CAMEL_OBJECT (containee));
-
@@ -274 +274 @@
-        camel_multipart_remove_part_at (CAMEL_MULTIPART (containee), id);
-
-
-
-
-
+
+
+
+
+
+
+
-
-        /* Warning: large lock that locks code, not data */
@@ -302 +305 @@
-        message = _tny_msg_header_get_camel_mime_message (TNY_MSG_HEADER (priv->header));
-
-message
+G_UNLIKELY (message)
-                _tny_msg_set_camel_mime_message (TNY_MSG (self), message);
-
@@ -318 +321 @@
-
-        g_mutex_lock (priv->header_lock);
-priv->header
+G_LIKELY (priv->header)
-                g_object_unref (G_OBJECT (priv->header));
-        priv->header = NULL;
@@ -381 +384 @@
-        gint nth=0;
-
-list
+G_LIKELY (list)
-        {
-                if (TNY_IS_MSG_MIME_PART_IFACE (list->data))
@@ -469 +472 @@
-        static GType type = 0;
-
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -475 +478 @@
-        }
-
-type == 0) 
+G_UNLIKELY(type == 0))
-        {
-                static const GTypeInfo info = 

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

@@ -432 +432 @@
-{
-        /* TODO: potential problem: singleton without lock */
-!the_singleton
+G_UNLIKELY (!the_singleton)
-        {
-                the_singleton = TNY_SESSION_CAMEL 
@@ -484 +484 @@
-        static CamelType tny_session_camel_type = CAMEL_INVALID_TYPE;
-        
-!camel_type_init_done
+G_UNLIKELY (!camel_type_init_done)
-        {
-                camel_type_init ();
@@ -490 +490 @@
-        }
-
-tny_session_camel_type == CAMEL_INVALID_TYPE
+G_UNLIKELY (tny_session_camel_type == CAMEL_INVALID_TYPE)
-        {
-                ms_parent_class = (CamelSessionClass *)camel_session_get_type();

trunk/libtinymail-camel/tny-store-account.c

@@ -66 +66 @@
-                camel_url_set_host (url, priv->host);
-        
-priv->url_string
+G_LIKELY (priv->url_string)
-                        g_free (priv->url_string);
-
-                priv->url_string = camel_url_to_string (url, 0);
-
-priv->service
+G_UNLIKELY (priv->service)
-                        camel_object_unref (CAMEL_OBJECT (priv->service));
-        
@@ -78 +78 @@
-                        priv->type, priv->ex);
-        
-
+
+
-                        g_error ("couldn't get service %s: %s\n", priv->url_string,
-                                   camel_exception_get_description (priv->ex));
@@ -88 +89 @@
-        }
-
-
+
+
+
-                camel_service_connect (priv->service, priv->ex);
-
@@ -104 +107 @@
-tny_store_account_clear_folders (TnyStoreAccountPriv *priv)
-{
-priv->folders
+G_LIKELY (priv->folders)
-        {
-                g_mutex_lock (priv->folders_lock);
@@ -111 +114 @@
-        }
-
-priv->ufolders
+G_UNLIKELY (priv->ufolders)
-        {
-                g_mutex_lock (priv->folders_lock);
@@ -139 +142 @@
-                tny_msg_folder_iface_set_account (iface, TNY_ACCOUNT_IFACE (self));
-
-