Changeset 1484

Timestamp:

01/27/07 13:03:35

Author:

djcb

Message:

* ChangeLog?, camel-pop3-(engine|folder).c:

• Added some temporary hack for the pop3 provider to not crash;
  

this will be replaced by a real solution later, but for now
we just don't want the crashes.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-engine.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-01-27  Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+
+        * Added some temporary hack for the pop3 provider to not
+          crash; this will be replaced by a real solution later, but for now
+          we just don't want the crashes.
+
-2007-01-27  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-engine.c

@@ -255 +255 @@
-engine_command_queue(CamelPOP3Engine *pe, CamelPOP3Command *pc)
-{
+
+#warning FIXME
+        if (!pe) {
+                g_warning ("FIXME: pe == NULL in %s", __FUNCTION__);
+                return FALSE;
+        }
+
-        if (((pe->capa & CAMEL_POP3_CAP_PIPE) == 0 || (pe->sentlen + strlen(pc->data)) > CAMEL_POP3_SEND_LIMIT)
-            && pe->current != NULL) {
@@ -291 +298 @@
-        CamelPOP3Command *pc, *pw, *pn;
-
+#warning FIXME
+        if (!pe) {
+                g_warning ("FIXME: pe == NULL in %s", __FUNCTION__);
+                return 0;
+        }
+        
-        if (pcwait && pcwait->state >= CAMEL_POP3_COMMAND_OK)
-                return 0;
@@ -419 +432 @@
-camel_pop3_engine_command_free(CamelPOP3Engine *pe, CamelPOP3Command *pc)
-{
+        #warning FIXME
+        if (!pe) {
+                g_warning ("FIXME: pe == NULL in %s", __FUNCTION__);
+                return;
+        }
+        
-        if (pe->current != pc)
-                e_dlist_remove((EDListNode *)pc);

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

@@ -308 +308 @@
-        camel_operation_start (NULL, _("Fetching summary information for new messages in folder"));
-
+        #warning FIXME
+        if (!pop3_store->engine) {
+                g_warning ("FIXME: pop3_store->engine == NULL in %s", __FUNCTION__);
+                return;
+        }
+
-        pcl = camel_pop3_engine_command_new(pop3_store->engine, CAMEL_POP3_COMMAND_MULTI, cmd_list, folder, "LIST\r\n");
-        if (pop3_store->engine->capa & CAMEL_POP3_CAP_UIDL)
@@ -960 +966 @@
-                g_free (mi->uid);
-        mi->flags |= CAMEL_MESSAGE_INFO_UID_NEEDS_FREE;
- 
+
-
-        camel_folder_summary_add (summary, (CamelMessageInfo *)mi);