Changeset 3423

Timestamp:

02/20/08 17:48:24

Author:

pvanhoof

Message:

2008-02-20 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Improvement for cancel's their reconnection
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-operation.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-operation.h (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c (modified) (6 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (4 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-02-20  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Improvement for cancel's their reconnection
+
-2008-02-18  Philip Van Hoof <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/camel-operation.c

@@ -25 +25 @@
-#endif
-
-#include <pthread.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/time.h>
-
-#ifdef HAVE_NSS
-#include <nspr.h>
-#endif
-
-#include <glib.h>
-
-#include <libedataserver/e-msgport.h>
-
-#include "camel-operation.h"
@@ -51 +39 @@
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-#endif
-};
-
-#define CAMEL_OPERATION_CANCELLED (1<<0)
-#define CAMEL_OPERATION_TRANSIENT (1<<1)
-

trunk/libtinymail-camel/camel-lite/camel/camel-operation.h

@@ -23 +23 @@
-#define CAMEL_OPERATION_H 1
-
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+
+#include <glib.h>
+
+#include <libedataserver/e-msgport.h>
+
+#ifdef HAVE_NSS
+#include <nspr.h>
+#endif
+
-G_BEGIN_DECLS
-
@@ -30 +44 @@
-
-typedef void (*CamelOperationStatusFunc)(struct _CamelOperation *op, const char *what, int sofar, int oftotal, void *data);
+
+#ifndef CAMEL_OPERATION_CANCELLED
+#define CAMEL_OPERATION_CANCELLED (1<<0)
+#endif
+
+
+struct _CamelOperation {
+        struct _CamelOperation *next;
+        struct _CamelOperation *prev;
+
+        pthread_t id;           /* id of running thread */
+        guint32 flags;          /* cancelled ? */
+        int blocked;            /* cancellation blocked depth */
+        int refcount;
+
+        CamelOperationStatusFunc status;
+        void *status_data;
+        unsigned int status_update;
+
+        /* stack of status messages (struct _status_stack *) */
+        GSList *status_stack;
+        struct _status_stack *lastreport;
+
+        EMsgPort *cancel_port;
+        int cancel_fd;
+#ifdef HAVE_NSS
+        PRFileDesc *cancel_prfd;
+#endif
+};
-
-typedef enum _camel_operation_status_t {

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

@@ -370 +370 @@
-
-
-
+, FALSE
-                imap_debug ("Recon in start: %s\n", camel_exception_get_description (&mex));
-
@@ -412 +412 @@
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-                                             _("Operation cancelled"));
-
+, TRUE
-                        imap_debug ("Recon in cont: %s\n", camel_exception_get_description (&mex));
-                        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
@@ -711 +711 @@
-                                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-                                                             _("Operation cancelled"));
-
+, TRUE
-                                        imap_debug ("Recon in untagged: %s\n", camel_exception_get_description (&mex));
-                                        camel_exception_clear (&mex);
@@ -731 +731 @@
-                                camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-                                                     _("Operation cancelled"));
-
+, TRUE
-                                imap_debug ("Recon in untagged idle: %s\n", camel_exception_get_description (&mex));
-                                camel_exception_clear (&mex);
@@ -876 +876 @@
-                                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-                                                             _("Operation cancelled"));
-
+, TRUE
-                                        imap_debug ("Recon in untagged: %s\n", camel_exception_get_description (&mex));
-                                        camel_exception_clear (&mex);
@@ -896 +896 @@
-                                camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-                                                     _("Operation cancelled"));
-
+, TRUE
-                                imap_debug ("Recon in untagged idle: %s\n", camel_exception_get_description (&mex));
-                                camel_exception_clear (&mex);

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

@@ -160 +160 @@
-
-void
-
+, gboolean was_cancel
-{
-        if (store->not_recon) {
-                camel_exception_set (mex, CAMEL_EXCEPTION_SERVICE_LOST_CONNECTION,
-                        _("Connection lost during operation"));
-                return;
-        } else {
-                CamelService *service = CAMEL_SERVICE (store);
@@ -195 +194 @@
-
-                service->reconnecting = FALSE;
+        }
+
+        if (was_cancel) {
+                CamelOperation *cc = camel_operation_registered ();
+                errno = EINTR;
+                cc->flags |= CAMEL_OPERATION_CANCELLED;
+                camel_operation_unref (cc);
-        }
-}
@@ -4212 +4218 @@
-                        CamelException mex = CAMEL_EXCEPTION_INITIALISER;
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-
+, TRUE
-                        imap_debug ("Recon: %s\n", camel_exception_get_description (&mex));
-                        camel_exception_clear (&mex);
@@ -4288 +4294 @@
-                        CamelException mex = CAMEL_EXCEPTION_INITIALISER;
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-
+, TRUE
-                        imap_debug ("Recon in nl: %s\n", camel_exception_get_description (&mex));
-                        camel_exception_clear (&mex);

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

@@ -198 +198 @@
-void camel_imap_store_stop_idle (CamelImapStore *store);
-void camel_imap_store_start_idle (CamelImapStore *store);
-
+, gboolean was_cancel
-
-G_END_DECLS