Changeset 1740

Timestamp:

03/20/07 23:04:27

Author:

pvanhoof

Message:

Potential fix for ticket 30

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (5 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (36 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.h (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (8 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-03-20  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Although this needs a lot testing, potential fix for ticket #30
+
-2007-03-19  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -149 +149 @@
-        mi->flags &= ~CAMEL_MESSAGE_PARTIAL;
-        mi->flags &= ~CAMEL_MESSAGE_EXPUNGED;
-        mi->flags &= ~CAMEL_MESSAGE_FREED;
-        mi->flags &= ~CAMEL_MESSAGE_SECURE;
-        mi->flags &= ~CAMEL_MESSAGE_FOLDER_FLAGGED;
-        /* CAMEL_MESSAGE_INFO_NEEDS_FREE 
-        CAMEL_MESSAGE_INFO_UID_NEEDS_FREE */
-        mi->flags &= ~CAMEL_MESSAGE_USER;
-
-}
@@ -402 +398 @@
-{
-        CamelFolderSummary *new = CAMEL_FOLDER_SUMMARY ( camel_object_new (camel_folder_summary_get_type ()));
-
-        new->folder = folder;
-        
-        return new;
-}
@@ -715 +709 @@
-                goto error;
-
+        if (s->messages && s->messages->len > s->saved_count)
+        {
+                int r, curlen = s->messages->len;
+                for (r = curlen - 1; r >= s->saved_count - 1; r--)
+                { 
+                        CamelMessageInfo *ri = g_ptr_array_index (s->messages, r);
+                        if (ri)
+                                camel_folder_summary_remove (s, ri);
+                }
+        }
+
-        /* now read in each message ... */
-i<s->saved_count;
+ i < s->saved_count; 
-        {
-                gboolean must_add = FALSE;
-                s->idx = i;
+
-                mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, &must_add);
-
@@ -3239 +3245 @@
-        if (mi == NULL || mi->refcount <=0)
-                retval = (void*) 0;
+        if (((CamelMessageInfoBase*)mi)->flags & CAMEL_MESSAGE_FREED)
+                retval = "Invalid";
-        else switch (id) 
-        {
@@ -3547 +3555 @@
-                retval = info_set_flags(mi, flags, set);
-
-
+un
-
-        return retval;

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

@@ -209 +209 @@
-        /* g_mutex_unlock (store->stream_lock);*/
-
-
+
+
+
+
+
+
-
-        /* Check for current folder */

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

@@ -2935 +2935 @@
-   GPtrArray *needheaders;
-   guint32 flags;
-i, 
+
-   CamelImapResponseType type;
-   const char *header_spec;
@@ -2971 +2971 @@
-   camel_folder_summary_prepare_hash (folder->summary);
-
+   store->dontdistridlehack = TRUE;
+
-   while (more)
-   {
@@ -3000 +3002 @@
-                more = FALSE;
-                camel_folder_summary_kill_hash (folder->summary);
+                store->dontdistridlehack = FALSE;
-                return;
-        }
@@ -3014 +3017 @@
-                        { if (!camel_operation_cancel_check (NULL))
-                                g_warning ("IMAP error getting UIDs (2)"); 
-
+
+
-                cnt = imap_get_uids (folder, store, ex, needheaders, (exists - seq) - cnt);
-
@@ -3027 +3031 @@
-                        more = FALSE;
-                        camel_folder_summary_kill_hash (folder->summary);
+                        store->dontdistridlehack = FALSE;
-                        return;
-                }
@@ -3042 +3047 @@
-                                        g_warning ("IMAP error getting UIDs (3)");
-                                        camel_folder_summary_kill_hash (folder->summary);
-
+
+
-                        camel_folder_summary_clear (folder->summary);
-                        tcnt = cnt = imap_get_uids (folder, store, ex, needheaders, (exists - seq) - tcnt);
@@ -3056 +3062 @@
-                                more = FALSE;
-                                camel_folder_summary_kill_hash (folder->summary);
+                                store->dontdistridlehack = FALSE;
-                                return;
-                        }
@@ -3090 +3097 @@
-                                more = FALSE;
-                                camel_folder_summary_kill_hash (folder->summary);
+                                store->dontdistridlehack = FALSE;
-                                return;
-                        }
@@ -3142 +3150 @@
-                                                for (r = curlen-1; r >= sequence -1; r--)
-                                                { 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                                                                camel_folder_summary_remove (folder->summary, ri);
+                                                        }
-                                                }
-                                        } else {
@@ -3187 +3206 @@
-                                more = FALSE;
-                                camel_folder_summary_kill_hash (folder->summary);
+                                store->dontdistridlehack = FALSE;
-                                return;
-                        }
@@ -3211 +3231 @@
-
-   imap_folder->need_rescan = oldrescval;
+   store->dontdistridlehack = FALSE;
-
-}
@@ -3229 +3250 @@
-
-static void 
-, gboolean restart
+
-{
-        CamelImapStore *store;
@@ -3267 +3288 @@
-                                                changes = camel_folder_change_info_new();
-                                        camel_folder_change_info_change_uid(changes, info->uid);
-                                        /* flags_to_label(idle_resp->folder, (CamelImapMessageInfo *)info); */
-                                }
-                                camel_message_info_free (info);
@@ -3286 +3306 @@
-                idle_resp->expunged, &ex);
-
-        /* Restart the idle if needed */
-        if (restart)
-                camel_imap_folder_start_idle (idle_resp->folder);
-
-}
-
@@ -3306 +3322 @@
-        {
-                char *fptr = resp;
-
-                /* 2 FETCH (FLAGS (\Recent \Seen))
-                 * 3 FETCH (FLAGS (\Recent \Seen))
-                 * 4 FETCH (FLAGS (\Recent \Seen)) */
-
-                FetchIdleResponse *fid = g_slice_new0 (FetchIdleResponse);
@@ -3358 +3370 @@
-}
-
+static void
+idle_real_start (CamelImapStore *store)
+{
+        g_mutex_lock (store->stream_lock);
+        store->idle_prefix = g_strdup_printf ("%c%.5u", 
+                store->tag_prefix, store->command++);
+        camel_stream_printf (store->ostream, "%s IDLE\r\n",
+                store->idle_prefix);
+        g_mutex_unlock (store->stream_lock);
+
+}
+
-static IdleResponse*
-done, gboolean *had_err
+*had_err, gboolean needlock, gboolean *hadlock
-{
-  IdleResponse *idle_resp = NULL;
@@ -3380 +3404 @@
-
-  locked = CAMEL_SERVICE_REC_TRYLOCK (store, connect_lock);
+  if (needlock && !locked)
+  {
+        CAMEL_SERVICE_REC_LOCK (store, connect_lock);
+        locked = TRUE;
+  }
+
-  if (locked)
-  {
+        *hadlock = TRUE;
+
-        if (store->current_folder)
-        {
@@ -3402 +3434 @@
-                        g_free (resp);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        {
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                g_mutex_lock (store->stream_lock);
-                if (!camel_disco_store_check_online ((CamelDiscoStore*)store, &ex))
@@ -3461 +3492 @@
-
-        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-  return idle_resp;
@@ -3515 +3524 @@
-        if (store->capabilities & IMAP_CAPABILITY_IDLE)
-        {
-
+
-                g_free (store->idle_prefix);
-                store->idle_prefix = NULL;
@@ -3522 +3531 @@
-                        g_source_remove (store->idle_signal);
-
-TRUE, &had_err
+&had_err, TRUE, &hadlock
-
-                /* Outside of the lock of course */
-                if (idle_resp && !had_err)
-
+
+
+
-
-                if (idle_resp) 
@@ -3541 +3552 @@
-        CamelImapFolder *imap_folder;
-        CamelImapStore *store;
-
+, hadlock = FALSE
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
@@ -3572 +3583 @@
-        if (store->idle_prefix != NULL)
-        {
-FALSE, &had_err
+&had_err, FALSE, &hadlock
-
-                if (idle_resp && !had_err)
-
+
+
+
+
+
-                if (idle_resp)
-                        idle_response_free (idle_resp);
@@ -3596 +3611 @@
-}
-
-static void 
-imap_set_push_email (CamelFolder *folder, gboolean setting)
-{
-        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
-
-        if (imap_folder->do_push_email && !setting) {
-                imap_folder->do_push_email = setting;
-                camel_imap_folder_stop_idle (folder);
-        }
-
-        if (!imap_folder->do_push_email && setting) {
-                imap_folder->do_push_email = setting;
-                camel_imap_folder_start_idle (folder);
-        }
-
-        return;
-}
-
-void
@@ -3642 +3640 @@
-                        folder->folder_flags |= CAMEL_FOLDER_HAS_PUSHEMAIL_CAPABILITY;
-
-
-
-
-
-
-
+
-
-                        store->idle_signal = g_timeout_add (5 * 1000, idle_timeout_checker, folder);
@@ -3658 +3651 @@
-}
-
+
+static void 
+imap_set_push_email (CamelFolder *folder, gboolean setting)
+{
+        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
+
+        if (imap_folder->do_push_email && !setting) {
+                imap_folder->do_push_email = setting;
+                camel_imap_folder_stop_idle (folder);
+        }
+
+        if (!imap_folder->do_push_email && setting) {
+                imap_folder->do_push_email = setting;
+                camel_imap_folder_start_idle (folder);
+        }
+
+        return;
+}
-/* Called with the store's connect_lock locked */
-void
@@ -3697 +3708 @@
-
-        len = camel_folder_summary_count (folder->summary);
-
+
+
+
-                imap_update_summary (folder, exists, changes, ex);
+                /* camel_imap_folder_start_idle (folder); will happen later? */
+        }
-
-        if (camel_folder_change_info_changed (changes))
@@ -3716 +3731 @@
-        CamelMessageInfo *info;
-        int len;
-
+
+
+
-        changes = camel_folder_change_info_new ();
-        if (expunged) {
@@ -3800 +3817 @@
-        CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
-        CamelStream *stream = NULL;
-
+, idle_rt = FALSE
-        CamelException tex = CAMEL_EXCEPTION_INITIALISER;
-        ssize_t nread = 0; 
@@ -3900 +3917 @@
-                        nread = 1;
-
+                        /* Stops idle */
-                        camel_imap_command_start (store, folder, ex,
-                                "UID FETCH %s BINARY.PEEK[%s]", uid, section_text);
@@ -3981 +3999 @@
-                        g_mutex_unlock (store->stream_lock);
-                        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
-
+
+
+
-
-                        if (err)
@@ -3997 +4017 @@
-                        nread = 0;
-
+                        /* Stops idle */
-                        if (store->server_level < IMAP_LEVEL_IMAP4REV1 && !*section_text)
-                                camel_imap_command_start (store, folder, ex,
@@ -4078 +4099 @@
-                        g_mutex_unlock (store->stream_lock);
-                        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
-
+
+
+
-
-                        if (nread <= 0) 
@@ -4117 +4140 @@
-                        nread = 0;
-
+                        /* Stops idle */
-                        camel_imap_command_start (store, folder, ex,
-                                "UID FETCH %s BODY.PEEK[%s]", uid, infos[t]);
@@ -4223 +4247 @@
-                        g_mutex_unlock (store->stream_lock);
-                        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
+                        /* Starts idle */
-                        camel_imap_store_start_idle (store);
+                        idle_rt = TRUE;
-
-                        if (nread <= 0) 
@@ -4250 +4276 @@
-
-errorhander:
+
+        if (!idle_rt)
+                camel_imap_folder_start_idle ((CamelFolder *) imap_folder);
-
-        CAMEL_IMAP_FOLDER_REC_UNLOCK (imap_folder, cache_lock);

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

@@ -263 +263 @@
-        CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);
-
+        imap_store->dontdistridlehack = FALSE;
-        imap_store->idle_signal = 0;
-        imap_store->idle_prefix = NULL;

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

@@ -143 +143 @@
-        gchar *idle_prefix;
-        guint idle_signal;
+        gboolean dontdistridlehack;
-};
-

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

@@ -226 +226 @@
-tny_gtk_header_list_model_get_value (GtkTreeModel *self, GtkTreeIter *iter, gint column, GValue *value)
-{
-        TnyHeader *header = NULL;
-        TnyGtkHeaderListModel *list_model = TNY_GTK_HEADER_LIST_MODEL (self);
-        const gchar *str;
@@ -248 +247 @@
-        }
-
-        header = list_model->items->pdata[i];
-
-        if (((GObject*)header)->ref_count <= 0)
-        {
-                g_warning ("GtkTreeModel in invalid state\n");
-                g_static_rec_mutex_unlock (list_model->iterator_lock);
-                g_mutex_unlock (list_model->folder_lock);
-                return;
-        }
-
-        switch (column) 
-        {
-                case TNY_GTK_HEADER_LIST_MODEL_CC_COLUMN:
-                        g_value_init (value, G_TYPE_STRING);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        if (str)
-                                g_value_set_string (value, str);
@@ -268 +257 @@
-                case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN:
-                        g_value_init (value, G_TYPE_STRING);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        if (rdate)
-                                g_value_set_string (value, rdate);
@@ -276 +265 @@
-                case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN:
-                        g_value_init (value, G_TYPE_STRING);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        if (rdate)
-                                g_value_set_string (value, rdate);
@@ -285 +274 @@
-                        g_value_init (value, G_TYPE_INT);
-                        g_value_set_int (value, 
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        break;
-                case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN:
-                        g_value_init (value, G_TYPE_INT);
-                        g_value_set_int (value, 
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        break;
-
-                case TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN:
-                        g_value_init (value, G_TYPE_INT);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        break;                  
-                case TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN:
-                        g_value_init (value, G_TYPE_OBJECT);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        break;
-                case TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN:
-                        g_value_init (value, G_TYPE_STRING);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        if (str)
-                                g_value_set_string (value, str);
@@ -309 +298 @@
-                case TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN:
-                        g_value_init (value, G_TYPE_STRING);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        if (str)
-                                g_value_set_string (value, str);
@@ -315 +304 @@
-                case TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN:
-                        g_value_init (value, G_TYPE_STRING);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        if (str)
-                                g_value_set_string (value, str);
@@ -321 +310 @@
-                case TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN:
-                        g_value_init (value, G_TYPE_INT);
-header
+(TnyHeader*) list_model->items->pdata[i]
-                        break;
-                default: