Changeset 1921

Timestamp:

05/08/07 20:13:04

Author:

pvanhoof

Message:

Oeps, some bugfixes

Files:

• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (15 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) (2 diffs)

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

@@ -3266 +3266 @@
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
+        idle_debug ("process_idle_response\n");
+
-        if (!idle_resp)
-                return;
@@ -3320 +3322 @@
-        char *ptr = strchr (resp, '*');
-
+        idle_debug ("read_idle_response\n");
+
-        if (ptr && strstr (resp, "EXISTS") != NULL)
-                idle_resp->exists = strtoul (resp + 1, NULL, 10);
@@ -3354 +3358 @@
-{
-        IdleResponse *idle_resp = g_slice_new0 (IdleResponse);
+
+        idle_debug ("idle_response_new\n");
+
-        idle_resp->folder = folder;
-        camel_object_ref (CAMEL_OBJECT (folder));
@@ -3362 +3369 @@
-idle_response_free (IdleResponse *idle_resp)
-{
+        idle_debug ("idle_response_free\n");
+
-        guint i=0;
-
@@ -3380 +3389 @@
-idle_real_start (CamelImapStore *store)
-{
+        idle_debug ("idle_real_start\n");
+
-        g_mutex_lock (store->stream_lock);
-        store->idle_prefix = g_strdup_printf ("%c%.5u", 
@@ -3398 +3409 @@
-  CamelImapResponseType type;
-  gboolean locked;
+
+
+  idle_debug ("idle_deal_with_stuff\n");
-
-  if (!folder || !CAMEL_IS_IMAP_FOLDER (folder))
@@ -3447 +3461 @@
-                if (store->ostream == NULL || ((CamelObject *)store->istream)->ref_count <= 0)
-                        { g_mutex_unlock (store->stream_lock); return NULL; }
-
+
+
-                        nwritten = camel_stream_printf (store->ostream, "DONE\r\n");
+                }
-                g_mutex_unlock (store->stream_lock);
-
@@ -3483 +3499 @@
-                if (store->ostream == NULL || ((CamelObject *)store->istream)->ref_count <= 0)
-                        { g_mutex_unlock (store->stream_lock); return NULL; }
-
+
+
-                        nwritten = camel_stream_printf (store->ostream, "DONE\r\n");
+                }
-                g_mutex_unlock (store->stream_lock);
-                if (nwritten == -1) 
@@ -3511 +3529 @@
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
+        idle_debug ("camel_imap_folder_stop_idle\n");
+
-        if (!folder || !CAMEL_IS_IMAP_FOLDER (folder))
-                return;
@@ -3527 +3547 @@
-        g_static_rec_mutex_lock (((CamelImapFolder *)folder)->idle_lock);
-
-store->capabilities & IMAP_CAPABILITY_IDLE
+(store->capabilities & IMAP_CAPABILITY_IDLE) && store->idle_prefix
-        {
-                gboolean hadlock = FALSE;
@@ -3554 +3574 @@
-idle_timeout_checker_destroy (gpointer data)
-{
-
+
+
-        return;
-}
@@ -3569 +3590 @@
-        ((CamelImapFolder *)folder)->in_idle = TRUE;
-
-/* printf ("idle\n"); */
+idle_debug ("idle_timeout_checker\n");
-
-        if ((!folder) || ((((CamelObject *)data)->ref_count <= 0) && (!CAMEL_IS_IMAP_FOLDER (folder))))
@@ -3602 +3623 @@
-                if (hadlock)
-                        idle_real_start (store);
-
-                if (idle_resp)
-                        idle_response_free (idle_resp);
@@ -3630 +3650 @@
-        CamelImapFolder *imap_folder = (CamelImapFolder *) folder;
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
+        idle_debug ("camel_imap_folder_start_idle\n");
-
-        if (!folder || !CAMEL_IS_IMAP_FOLDER (folder))
@@ -3654 +3676 @@
-                        idle_real_start (store);
-
-5 * 1000, G_PRIORITY_DEFAULT_IDLE, 
+G_PRIORITY_DEFAULT_IDLE, 5 * 1000,
-                                idle_timeout_checker, folder, idle_timeout_checker_destroy);
-

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

@@ -150 +150 @@
-                imap_store->idle_prefix=NULL;
-                g_mutex_lock (imap_store->stream_lock);
+                idle_debug ("Sending DONE in let_idle_die\n");
-                camel_stream_printf (imap_store->ostream, "DONE\r\n");
-                g_mutex_unlock (imap_store->stream_lock);

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

@@ -26 +26 @@
-#define CAMEL_IMAP_STORE_H 1
-
+/* #define IDLE_DEBUG 1 */
+
+#ifdef IDLE_DEBUG
+#define idle_debug(o)   printf ("%s\n", o)
+#else
+#define idle_debug(o)   
+#endif
-
-#ifdef __cplusplus

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

@@ -589 +589 @@
-                }
-
-1000, G_PRIORITY_DEFAULT_IDLE
+G_PRIORITY_DEFAULT_IDLE,1000
-                        notify_views_add, me, notify_views_add_destroy);
-        }
@@ -697 +697 @@
-        stuff->loop = g_main_loop_new (NULL, FALSE);
-
-0, G_PRIORITY_HIGH_IDLE, 
+G_PRIORITY_HIGH_IDLE, 0,
-                notify_views_delete, stuff, notify_views_delete_destroy);
-        stuff->src = (gint) add_del_timeout (me, src);