[Commits] [SCM] claws branch, master, updated. 3.10.0-8-g7c1bb13

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  7c1bb13b902e8974b364a6e92d88e48c3a2fdcd0 (commit)
      from  549a885ee1c2030c75a6e55b386ef744a07940fb (commit)


- Log -----------------------------------------------------------------
commit 7c1bb13b902e8974b364a6e92d88e48c3a2fdcd0
Author: Colin Leroy <colin at colino.net>
Date:   Wed May 28 20:22:03 2014 +0200

    Fix the race fix, now preventing the compose window to be closed.

diff --git a/src/compose.c b/src/compose.c
index 11d8e1d..a13e4ea 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9782,7 +9782,7 @@ gboolean compose_draft (gpointer data, guint action)
 		debug_print("couldn't lock mutex, probably sending\n");
 		return FALSE;
 	}
-	
+
 	lock = TRUE;
 
 	tmp = g_strdup_printf("%s%cdraft.%p", get_tmp_dir(),
@@ -11563,18 +11563,12 @@ gboolean compose_close(Compose *compose)
 				g_timeout_add (500, (GSourceFunc) compose_close,
 				compose);
 		}
-		return FALSE;
+		return TRUE;
 	}
 	
-	if (compose->close_timeout_tag) {
-		/* let the close be done by the deferred callback */
-		g_mutex_unlock(compose->mutex);
-		return FALSE;
-	}
-
 	if (compose->draft_timeout_tag >= 0) {
 		g_source_remove(compose->draft_timeout_tag);
-		compose->draft_timeout_tag = COMPOSE_DRAFT_TIMEOUT_UNSET;
+		compose->draft_timeout_tag = COMPOSE_DRAFT_TIMEOUT_FORBIDDEN;
 	}
 
 	gtkut_widget_get_uposition(compose->window, &x, &y);

-----------------------------------------------------------------------

Summary of changes:
 src/compose.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Claws Mail