Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mail

Dir     : e_modules/mail


Modified Files:
        imap.c 


Log Message:
Imap "Should" work again, cannot test it here tho.

===================================================================
RCS file: /cvs/e/e_modules/mail/imap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- imap.c      13 Jun 2006 13:39:55 -0000      1.6
+++ imap.c      13 Jun 2006 14:50:28 -0000      1.7
@@ -41,8 +41,8 @@
                    {
                       if (ecore_con_ssl_available_get() && (ic->config->ssl))
                         type |= ECORE_CON_USE_SSL;
-                      ic->server->server = ecore_con_server_connect(type, 
ic->config->host, ic->config->port, NULL);
                       ic->server->state = IMAP_STATE_DISCONNECTED;
+                      ic->server->server = ecore_con_server_connect(type, 
ic->config->host, ic->config->port, NULL);
                       ic->server->cmd = 0;
                    }
               }
@@ -122,9 +122,6 @@
    Evas_List *l, *j;
    int found = 0;
    
-   cb = data;
-   if (!cb) return NULL;
-
    if ((!iservers) || (evas_list_count(iservers) <= 0)) 
      {
        is = E_NEW(ImapServer, 1);
@@ -154,6 +151,7 @@
      }
    if (!found) 
      {
+       cb = data;
        ic = E_NEW(ImapClient, 1);
        ic->config = cb;
        ic->server = is;
@@ -194,6 +192,7 @@
    ecore_con_server_del(is->server);
    is->server = NULL;
    
+   _mail_set_text(is->data);
    return 0;
 }
 
@@ -252,7 +251,6 @@
          {
             ic->config->num_new = num;
             ic->config->num_total = total;
-            _mail_set_text(is->data);
 
             if ((num > 0) && (ic->config->use_exec) && (ic->config->exec))
               _mail_start_exe(ic->config);
@@ -261,7 +259,16 @@
             if (is->clients) 
               {
                  is->current = is->clients->data;
-                 is->state = IMAP_STATE_SERVER_READY;
+                 if (is->current) 
+                   {
+                      ic = is->current;
+                      is->state = IMAP_STATE_SERVER_READY;
+                   }
+                 else 
+                   {
+                      _mail_imap_server_logout(is);
+                      ic = NULL;                      
+                   }
               }
             else 
               {




_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to