complete sync of 2002-10-04
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 13 Oct 2002 14:30:28 +0000 (14:30 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 13 Oct 2002 14:30:28 +0000 (14:30 +0000)
ChangeLog
ChangeLog.jp
src/inc.c

index e4550d3..1c028e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-04
+
+       * src/account.c: account_find_from_item(): fixed a bug which didn't
+         select the correct account.
+       * inc_pop3_session_do():
+         fixed the resource leak when SSL initialization failed.
+         Immediately break from temporary event loop if cancelled.
+
 2002-10-04
 
        * src/account.[ch]: account_find_from_item(): new.
index 5c42a5d..3452a8b 100644 (file)
@@ -1,3 +1,11 @@
+2002-10-04
+
+       * src/account.c: account_find_from_item(): Àµ¤·¤¤¥¢¥«¥¦¥ó¥È¤òÁªÂò
+         ¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£
+       * inc_pop3_session_do():
+         SSL ¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤¿¤È¤­¤Î¥ê¥½¡¼¥¹¤Î¥ê¡¼¥¯¤ò½¤Àµ¡£
+         ¥­¥ã¥ó¥»¥ë¤µ¤ì¤¿¤é°ì»þŪ¤Ê¥¤¥Ù¥ó¥È¥ë¡¼¥×¤«¤é¤¹¤°¤ËÈ´¤±¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2002-10-04
 
        * src/account.[ch]: account_find_from_item(): ¿·µ¬¡£
index e43898b..c17cfcd 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -774,7 +774,7 @@ static IncState inc_pop3_session_do(IncSession *session)
 #if USE_SSL
        if (pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL &&
            !ssl_init_socket(sockinfo)) {
-               pop3_automaton_terminate(NULL, atm);
+               pop3_automaton_terminate(sockinfo, atm);
                automaton_destroy(atm);
                session->inc_state = INC_CONNECT_ERROR;
                return INC_CONNECT_ERROR;
@@ -800,9 +800,12 @@ static IncState inc_pop3_session_do(IncSession *session)
                                      atm->state[atm->num].condition,
                                      automaton_input_cb, atm);
 
-       while (!atm->terminated)
+       while (!atm->terminated && !atm->cancelled)
                gtk_main_iteration();
 
+       if (!atm->terminated)
+               pop3_automaton_terminate(sockinfo, atm);
+
        log_verbosity_set(FALSE);
        /* oha: see above */
        recv_set_ui_func(NULL, NULL);