Changeset 3526

Timestamp:

03/26/08 13:47:40

Author:

jdapena

Message:

* Replace old tny_header_get_ api for strings with

tny_header_dup_ api. This should be a bit better for
being thread safe. Also modified code using this. The
goal is being able to do the string copy in a lock.

* Now moving a folder copies all the cached messages,

but not the summaries, to avoid crashes trying to
reuse the old summary.

This is a major API change.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/bindings/vala/libtinymail-1.0/libtinymail-1.0.gi (modified) (6 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-mime-part-utils.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-bs-msg-header.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-bs-msg.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-full-msg-receive-strategy.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-header.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-msg-header.c (modified) (12 diffs)
• trunk/libtinymail-camel/tny-camel-msg-remove-strategy.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-msg.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-remote-msg-remove-strategy.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (1 diff)
• trunk/libtinymail/tny-expunged-header.c (modified) (2 diffs)
• trunk/libtinymail/tny-folder-monitor.c (modified) (3 diffs)
• trunk/libtinymail/tny-header.c (modified) (4 diffs)
• trunk/libtinymail/tny-header.h (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (14 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-view.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-msg-window.c (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (6 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-03-26  Jose Dapena Paz  <jdapena@igalia.com>
+
+        * Replace old tny_header_get_ api for strings with
+        tny_header_dup_ api. This should be a bit better for
+        being thread safe. Also modified code using this. The
+        goal is being able to do the string copy in a lock.
+
+        * Now moving a folder copies all the cached messages,
+        but not the summaries, to avoid crashes trying to
+        reuse the old summary.
+
+        This is a major API change.
+
-2008-03-25  Alberto Garcia Gonzalez <agarcia@igalia.com>
-

trunk/bindings/vala/libtinymail-1.0/libtinymail-1.0.gi

@@ -2154 +2154 @@
-                                <interface name="GObject"/>
-                        </requires>
-get_bcc" symbol="tny_header_get
-
-
-
-
-
-get_cc" symbol="tny_header_get
+dup_bcc" symbol="tny_header_dup
+
+
+
+
+
+dup_cc" symbol="tny_header_dup
-                                <return-type type="gchar*"/>
-                                <parameters>
@@ -2190 +2190 @@
-                                </parameters>
-                        </method>
-get_from" symbol="tny_header_get
-
-
-
-
-
-get_message_id" symbol="tny_header_get
+dup_from" symbol="tny_header_dup
+
+
+
+
+
+dup_message_id" symbol="tny_header_dup
-                                <return-type type="gchar*"/>
-                                <parameters>
@@ -2214 +2214 @@
-                                </parameters>
-                        </method>
-get_replyto" symbol="tny_header_get
-
-
-
-
-
-get_subject" symbol="tny_header_get
-
-
-
-
-
-get_to" symbol="tny_header_get
-
-
-
-
-
-get_uid" symbol="tny_header_get
+dup_replyto" symbol="tny_header_dup
+
+
+
+
+
+dup_subject" symbol="tny_header_dup
+
+
+
+
+
+dup_to" symbol="tny_header_dup
+
+
+
+
+
+dup_uid" symbol="tny_header_dup
-                                <return-type type="gchar*"/>
-                                <parameters>
@@ -2301 +2301 @@
-                                </parameters>
-                        </method>
-get
-
-
-
-
-
-get
+dup
+
+
+
+
+
+dup
-                                <return-type type="gchar*"/>
-                                <parameters>
@@ -2337 +2337 @@
-                                </parameters>
-                        </vfunc>
-get
-
-
-
-
-
-get
+dup
+
+
+
+
+
+dup
-                                <return-type type="gchar*"/>
-                                <parameters>
@@ -2355 +2355 @@
-                                </parameters>
-                        </vfunc>
-get
-
-
-
-
-
-get
-
-
-
-
-
-get
-
-
-
-
-
-get
+dup
+
+
+
+
+
+dup
+
+
+
+
+
+dup
+
+
+
+
+
+dup
-                                <return-type type="gchar*"/>
-                                <parameters>

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

@@ -4035 +4035 @@
-}
-
+void
+camel_folder_summary_lock ()
+{
+        g_static_rec_mutex_lock (&global_lock); 
+}
+
+void
+camel_folder_summary_unlock ()
+{
+        g_static_rec_mutex_unlock (&global_lock);       
+}
-
-static void

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h

@@ -401 +401 @@
-#endif
-
+void camel_folder_summary_lock ();
+void camel_folder_summary_unlock ();
+
-G_END_DECLS
-

trunk/libtinymail-camel/camel-lite/camel/camel-mime-part-utils.c

@@ -61 +61 @@
-        GByteArray *buffer = NULL;
-        CamelStream *stream;
-off_
+uin
-        int fd = -1;
-        size_t len;
@@ -73 +73 @@
-                stream = NULL;
-
-
+
+
-                /* we can keep content on disk */
-        } else {

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -3033 +3033 @@
-}
-
+static void
+move_cache (const gchar *oldpath, const gchar *newpath)
+{
+        GDir *dir;
+
+        dir = g_dir_open (oldpath, 0, NULL);
+        if (dir) {
+                const gchar *file;
+                gchar *new_summary;
+
+                g_mkdir (newpath, S_IRWXU);
+
+                while (file = g_dir_read_name (dir)) {
+                        gchar *old_fullname;
+                        gchar *new_fullname;
+                        old_fullname = g_strdup_printf ("%s/%s", oldpath, file);
+                        new_fullname = g_strdup_printf ("%s/%s", newpath, file);
+                        if (g_file_test (old_fullname, G_FILE_TEST_IS_DIR)) {
+                                move_cache (old_fullname, new_fullname);
+                        } else if (g_file_test (old_fullname, G_FILE_TEST_EXISTS)) {
+                                /* we don't move the summary */
+                                if (strcmp (old_fullname, "summary.mmap")!=0)
+                                        g_rename (old_fullname, new_fullname);
+                        }
+
+                        g_free (old_fullname);
+                        g_free (new_fullname);
+                }
+                g_dir_close (dir);
+                new_summary = g_strdup_printf ("%s/summary.mmap", newpath);
+                if (g_file_test (new_summary, G_FILE_TEST_EXISTS)) {
+                        g_unlink (new_summary);
+                }
+        }
+}
-
-static void
@@ -3124 +3159 @@
-        g_free (tpath);
-
-
-
-
-
+
-
-        g_free (oldpath);

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

@@ -37 +37 @@
-
-
-const 
-get
-
-
-me->envelope->reply_to
+
+dup
+
+
+g_strdup (me->envelope->reply_to)
-}
-
@@ -89 +89 @@
-
-
-const 
-get
-
-
-me->envelope->cc
-
-
-const 
-get
-
-
-me->envelope->bcc
+
+dup
+
+
+g_strdup (me->envelope->cc)
+
+
+
+dup
+
+
+g_strdup (me->envelope->bcc)
-}
-
@@ -137 +137 @@
-}
-
-const 
-get
-
-
-me->envelope->from
-
-
-const 
-get
-
-
-me->envelope->subject
-
-
-
-const 
-get
-
-
-me->envelope->to
-
-
-const 
-get
-
-
-me->envelope->message_id
+
+dup
+
+
+g_strdup (me->envelope->from)
+
+
+
+dup
+
+
+g_strdup (me->envelope->subject)
+
+
+
+
+dup
+
+
+g_strdup (me->envelope->to)
+
+
+
+dup
+
+
+g_strdup (me->envelope->message_id)
-}
-
@@ -175 +175 @@
-}
-
-const 
-get
-
-get
+
+dup
+
+dup
-                "The uid of it is therefore not available. This indicates a problem "
-                "in the software.");
@@ -215 +215 @@
-        TnyHeaderIface *klass = (TnyHeaderIface *)g;
-
-get_from= tny_camel_bs_msg_header_get
-get_message_id= tny_camel_bs_msg_header_get
+dup_from= tny_camel_bs_msg_header_dup
+dup_message_id= tny_camel_bs_msg_header_dup
-        klass->get_message_size= tny_camel_bs_msg_header_get_message_size;
-get_to= tny_camel_bs_msg_header_get
-get_subject= tny_camel_bs_msg_header_get
+dup_to= tny_camel_bs_msg_header_dup
+dup_subject= tny_camel_bs_msg_header_dup
-        klass->get_date_received= tny_camel_bs_msg_header_get_date_received;
-        klass->get_date_sent= tny_camel_bs_msg_header_get_date_sent;
-get_cc= tny_camel_bs_msg_header_get
-get_bcc= tny_camel_bs_msg_header_get
-get_replyto= tny_camel_bs_msg_header_get
-get_uid= tny_camel_bs_msg_header_get
+dup_cc= tny_camel_bs_msg_header_dup
+dup_bcc= tny_camel_bs_msg_header_dup
+dup_replyto= tny_camel_bs_msg_header_dup
+dup_uid= tny_camel_bs_msg_header_dup
-        klass->get_folder= tny_camel_bs_msg_header_get_folder;
-        klass->set_bcc= tny_camel_bs_msg_header_set_bcc;

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

@@ -120 +120 @@
-        CamelFolder *cfolder = _tny_camel_folder_get_camel_folder (TNY_CAMEL_FOLDER (folder));
-
-g_strdup (tny_header_get_uid (TNY_HEADER (header)
+tny_header_dup_uid (TNY_HEADER (header
-        structure_str = camel_folder_fetch_structure (cfolder, (const char *) uid, &ex);
-

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

@@ -112 +112 @@
-        if (priv->folder) {
-                TnyHeader *header = tny_msg_get_header (self);
-const gchar *uid = tny_header_get
+gchar *uid = tny_header_dup
-
-                if (uid) {
@@ -129 +129 @@
-                                }
-                        }
+                        g_free (uid);
-                }
-

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

@@ -3786 +3786 @@
-        {
-                TnyHeader *header;
-const 
+
-
-                header = TNY_HEADER (tny_iterator_get_current (iter));
-get
+dup
-
-                if (G_UNLIKELY (uid == NULL)) 
@@ -3812 +3812 @@
-                        return;
-                } else
-g_strdup (uid)
+uid
-
-                g_object_unref (header);

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

@@ -76 +76 @@
-                mtype = CAMEL_FOLDER_RECEIVE_ANY_OR_FULL;
-
-g_strdup (tny_header_get_uid (TNY_HEADER (header)
+tny_header_dup_uid (TNY_HEADER (header
-        message = NULL;
-        camel_message = camel_folder_get_message (priv->folder, (const char *) id, mtype, -1, &ex);
@@ -98 +98 @@
-                                tny_header_get_date_received (header));
-                        _tny_camel_msg_set_folder (TNY_CAMEL_MSG (message), folder);
-g_strdup (tny_header_get_uid (header)
+tny_header_dup_uid (header
-                        _tny_camel_msg_set_header (TNY_CAMEL_MSG (message), nheader);
-                        _tny_camel_mime_part_set_part (TNY_CAMEL_MIME_PART (message), 

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

@@ -72 +72 @@
-
-
-const 
-get
+
+dup
-{
-        return NULL;
@@ -123 +123 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        return NULL;
@@ -223 +225 @@
-}
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return retval;
@@ -283 +293 @@
-}
-
-const 
-get
-
-
-const 
-
-camel_message_info_uid (me->info
+
+dup
+
+
+
+
+g_strdup (camel_message_info_uid (me->info)
-
-        return retval;
@@ -353 +363 @@
-        TnyHeaderIface *klass = (TnyHeaderIface *)g;
-
-get_from= tny_camel_header_get
-get_message_id= tny_camel_header_get
+dup_from= tny_camel_header_dup
+dup_message_id= tny_camel_header_dup
-        klass->get_message_size= tny_camel_header_get_message_size;
-get_to= tny_camel_header_get
-get_subject= tny_camel_header_get
+dup_to= tny_camel_header_dup
+dup_subject= tny_camel_header_dup
-        klass->get_date_received= tny_camel_header_get_date_received;
-        klass->get_date_sent= tny_camel_header_get_date_sent;
-get_cc= tny_camel_header_get
-get_bcc= tny_camel_header_get
-get_replyto= tny_camel_header_get
-get_uid= tny_camel_header_get
+dup_cc= tny_camel_header_dup
+dup_bcc= tny_camel_header_dup
+dup_replyto= tny_camel_header_dup
+dup_uid= tny_camel_header_dup
-        klass->get_folder= tny_camel_header_get_folder;
-        klass->set_bcc= tny_camel_header_set_bcc;

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

@@ -353 +353 @@
-                TnyHeader *hdr = NULL;
-                TnyHeader *dest_header;
+                gchar *str;
-
-                hdr = tny_msg_get_header (TNY_MSG (orig));
-                retval = TNY_MIME_PART (tny_camel_msg_new ());
-                dest_header = tny_msg_get_header (TNY_MSG (retval));
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                /* tny_header_set_priority (dest_header, tny_header_get_priority (hdr)); */
-                g_object_unref (hdr);
@@ -696 +709 @@
-        if (dw->mime_type && (charset = camel_content_type_param 
-                        (dw->mime_type, "charset")) && 
-
++
-        {
-                CamelStream *null;

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

@@ -89 +89 @@
-}
-
-const 
-get
+
+dup
-{
-        TnyCamelMsgHeader *me = TNY_CAMEL_MSG_HEADER (self);
@@ -100 +100 @@
-        }
-
-(const gchar *) me->reply_to
+g_strdup ((const gchar *) me->reply_to)
-}
-
@@ -205 +205 @@
-
-
-const 
-get
+
+dup
-{
-        TnyCamelMsgHeader *me = TNY_CAMEL_MSG_HEADER (self);
@@ -216 +216 @@
-        }
-
-(const gchar *) me->cc
-
-
-const 
-get
+g_strdup ((const gchar *) me->cc)
+
+
+
+dup
-{
-        TnyCamelMsgHeader *me = TNY_CAMEL_MSG_HEADER (self);
@@ -230 +230 @@
-        }
-
-(const gchar *) me->bcc
+g_strdup ((const gchar *) me->bcc)
-}
-
@@ -387 +387 @@
-}
-
-const 
-get
+
+dup