Changeset 1951

Timestamp:

05/14/07 17:37:59

Author:

pvanhoof

Message:

Bugfix

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (2 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/po/Makefile.in.in (modified) (3 diffs)
• trunk/tests/functional (modified) (1 prop)
• trunk/tests/functional/.svnignore (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-05-14  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Waiting for the + continuation after IDLE
+        * Please watch this fix with different IMAP implementations
+
-2007-05-14  Sergio Villar Senin  <svillar@igalia.com>
-

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

@@ -3389 +3389 @@
-idle_real_start (CamelImapStore *store)
-{
+        char *resp;
+        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
-        idle_debug ("idle_real_start\n");
-
@@ -3396 +3399 @@
-        camel_stream_printf (store->ostream, "%s IDLE\r\n",
-                store->idle_prefix);
+
+        resp = NULL;
+        while (camel_imap_store_readline_nl (store, &resp, &ex) > 0)
+        {
+                gboolean tbreak = FALSE;
+                if (!strncmp (resp, "+ ", 2))
+                        tbreak = TRUE;
+                /* printf ("-> %s\n", resp); */
+                g_free (resp); resp=NULL;
+                if (tbreak)
+                        break;
+        }
+        if (resp)
+                g_free (resp);
+
-        g_mutex_unlock (store->stream_lock);
-

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

@@ -3642 +3642 @@
-
-ssize_t
+camel_imap_store_readline_nl (CamelImapStore *store, char **dest, CamelException *ex)
+{
+        CamelStreamBuffer *stream;
+        char linebuf[1024] = {0};
+        GByteArray *ba;
+        ssize_t nread;
+        
+        g_return_val_if_fail (CAMEL_IS_IMAP_STORE (store), -1);
+        g_return_val_if_fail (dest, -1);
+        
+        *dest = NULL;
+        
+        /* Check for connectedness. Failed (or cancelled) operations will
+         * close the connection. We can't expect a read to have any
+         * meaning if we reconnect, so always set an exception.
+         */
+
+        if (!camel_disco_store_check_online((CamelDiscoStore *)store, ex))
+                return -1;
+
+        camel_imap_store_restore_stream_buffer (store);
+        stream = CAMEL_STREAM_BUFFER (store->istream);
+
+        ba = g_byte_array_new ();
+        while ((nread = camel_stream_buffer_gets (stream, linebuf, sizeof (linebuf))) > 0) {
+                g_byte_array_append (ba, (const guchar*) linebuf, nread);
+                if (linebuf[nread - 1] == '\n')
+                        break;
+        }
+
+        if (nread <= 0) {
+                if (errno == EINTR)
+                {
+                        CamelException mex = CAMEL_EXCEPTION_INITIALISER;
+                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
+                        camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
+                        camel_service_connect (CAMEL_SERVICE (store), &mex);
+                } else {
+                        camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
+                                              _("Server unexpectedly disconnected: %s"),
+                                              g_strerror (errno));
+                        camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
+                }
+
+                g_byte_array_free (ba, TRUE);
+                return -1;
+        }
+        
+        if (camel_verbose_debug) {
+                fprintf (stderr, "received: ");
+                fwrite (ba->data, 1, ba->len, stderr);
+        }
+        
+        /* camel-imap-command.c:imap_read_untagged expects the CRLFs
+           to be stripped off and be nul-terminated *sigh* */
+        nread = ba->len - 1;
+        ba->data[nread] = '\0';
+        if (ba->data[nread - 1] == '\r') {
+                ba->data[nread - 1] = '\0';
+                nread--;
+        }
+        
+        *dest = (char *) ba->data;
+        g_byte_array_free (ba, FALSE);
+        
+        return nread;
+}
+
+ssize_t
-camel_imap_store_readline_nb (CamelImapStore *store, char **dest, CamelException *ex)
-{

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

@@ -175 +175 @@
-gboolean camel_imap_store_connected (CamelImapStore *store, CamelException *ex);
-
+ssize_t camel_imap_store_readline_nl (CamelImapStore *store, char **dest, CamelException *ex);
-ssize_t camel_imap_store_readline_nb (CamelImapStore *store, char **dest, CamelException *ex);
-ssize_t camel_imap_store_readline (CamelImapStore *store, char **dest, CamelException *ex);

trunk/po/Makefile.in.in

@@ -26 +26 @@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
-datadir = @datadir@
-libdir = @libdir@
@@ -41 +42 @@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
@@ -79 +81 @@
-.po.gmo:
-        file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
--c
+$(MSGFMT_OPTS)
-
-.po.cat:

trunk/tests/functional/.svnignore

@@ +1 @@
+account-refresh
-anything
-msg-sender