sync with 0.8.11cvs35
authorPaul Mangan <paul@claws-mail.org>
Fri, 25 Apr 2003 10:52:33 +0000 (10:52 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 25 Apr 2003 10:52:33 +0000 (10:52 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/common/session.c
src/inc.c
src/send_message.c

index fd9ac9a..23b7c82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,25 @@
+2003-04-25
+
+       * src/session.c: session_close(): kill child process only if
+         state is not SESSION_DISCONNECTED.
+       * src/send_message.c: send_cancel_button_cb()
+         src/inc.c: inc_cancel(): don't set Session::state to
+         SESSION_DISCONNECTED.
+       * src/prefs.[ch]: modified the names of prefs_write_*().
+       * src/address.[ch]: removed.
+
+2003-04-24
+
+       * src/compose.c: compose_template_apply(): overwrite recipients.
+
 2003-04-23
 
        * src/procheader.c: procheader_date_parse(): removed debug print.
        * src/session.c: changed every g_print to debug_print.
          session_child_input(): removed unrequired session_close() (it'll
          be closed anyway after returning FALSE).
+       * src/send_message.c: send_message_smtp(): changed g_print to
+         debug_print.
 
 2003-04-23
 
index 3fdca23..3732b10 100644 (file)
@@ -1,3 +1,11 @@
+2003-04-25 [paul]      0.8.11claws110
+
+       * sync with 0.8.11cvs35
+               see ChangeLog 2003-04-24 and 2003-04-25
+               
+       * src/gtk/pluginwindow.c
+               correct another strange float value
+
 2003-04-24 [christoph] 0.8.11claws109
 
        * src/folder.c
index 81242ea..df13b96 100644 (file)
@@ -1,9 +1,25 @@
+2003-04-25
+
+       * src/session.c: session_close(): state ¤¬ SESSION_DISCONNECTED ¤Ç
+         ¤Ê¤¤¾ì¹ç¤Î¤ß»Ò¥×¥í¥»¥¹¤ò kill ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/send_message.c: send_cancel_button_cb()
+         src/inc.c: inc_cancel(): Session::state ¤ò SESSION_DISCONNECTED ¤Ë
+         ¥»¥Ã¥È¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+       * src/prefs.[ch]: prefs_write_*() ¤Î̾Á°¤òÊѹ¹¡£
+       * src/address.[ch]: ºï½ü¡£
+
+2003-04-24
+
+       * src/compose.c: compose_template_apply(): °¸Àè¤ò¾å½ñ¤­¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2003-04-23
 
        * src/procheader.c: procheader_date_parse(): ¥Ç¥Ð¥Ã¥°ÍÑ print ¤òºï½ü¡£
        * src/session.c: ³Æ g_print ¤ò debug_print ¤ËÊѹ¹¡£
          session_child_input(): ÉÔÍפʠsession_close() ¤òºï½ü(FALSE ¤ò
          ÊÖ¤·¤¿¸å·ë¶É close ¤µ¤ì¤ë)¡£
+       * src/send_message.c: send_message_smtp(): g_print ¤ò debug_print
+         ¤ËÊѹ¹¡£
 
 2003-04-23
 
index 52b8df5..d9c97c5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws109
+EXTRA_VERSION=claws110
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -373,7 +373,7 @@ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
 fi
 
 AC_ARG_ENABLE(mathml-viewer-plugin,
-       [  --enable-mathml-viewer-plugin    Build MarhML-Viewer plugin [default=no]],
+       [  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=no])
 AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
index a640f4e..e1cbf9e 100644 (file)
@@ -299,7 +299,8 @@ static gint session_close(Session *session)
 
        if (session->child_pid) {
                g_print("$$$ %s: closing child\n", session->child_pid == 0 ? "child" : "parent");
-               kill(session->child_pid, SIGTERM);
+               if (session->state != SESSION_DISCONNECTED)
+                       kill(session->child_pid, SIGTERM);
                waitpid(session->child_pid, NULL, 0);
                session->child_pid = 0;
        }
index cd2a2be..522e4e7 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -720,7 +720,8 @@ static IncState inc_pop3_session_do(IncSession *session)
        statusbar_verbosity_set(TRUE);
 
        while (SESSION(pop3_session)->state != SESSION_DISCONNECTED &&
-              SESSION(pop3_session)->state != SESSION_ERROR)
+              SESSION(pop3_session)->state != SESSION_ERROR &&
+              session->inc_state != INC_CANCEL)
                gtk_main_iteration();
 
 
@@ -954,7 +955,6 @@ static void inc_cancel(IncProgressDialog *dialog)
 
        session = dialog->queue_list->data;
 
-       session->session->state = SESSION_DISCONNECTED;
        session->inc_state = INC_CANCEL;
 
        log_message(_("Incorporation cancelled\n"));
index 5a2a6ba..e31beff 100644 (file)
@@ -398,10 +398,11 @@ gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
                return -1;
        }
 
-       g_print("parent: begin event loop\n");
+       debug_print("send_message_smtp(): begin event loop\n");
 
        while (session->state != SESSION_DISCONNECTED &&
-              session->state != SESSION_ERROR)
+              session->state != SESSION_ERROR &&
+              dialog->cancelled == FALSE)
                gtk_main_iteration();
 
        if (SMTP_SESSION(session)->error_val == SM_AUTHFAIL) {
@@ -547,8 +548,6 @@ static void send_progress_dialog_destroy(SendProgressDialog *dialog)
 static void send_cancel_button_cb(GtkWidget *widget, gpointer data)
 {
        SendProgressDialog *dialog = (SendProgressDialog *)data;
-       Session *session = dialog->session;
 
-       session->state = SESSION_DISCONNECTED;
        dialog->cancelled = TRUE;
 }