talons

commit 5e1e3a0cb3e471ec15b7503fde86a7a1f7d0ca23
parent f19a85fc671e7afc72689e3d417b03cd52e34777
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 23 May 2014 11:37:26 +0200

Better place to remove the draft callback, where we hold the mutex

Diffstat:
M
src/compose.c
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -8691,11 +8691,6 @@ static void compose_destroy(Compose *compose)
 		return;
 	}
 
-	if (compose->draft_timeout_tag >= 0) { /* CLAWS: disable draft timeout */
-		g_source_remove(compose->draft_timeout_tag);
-		compose->draft_timeout_tag = COMPOSE_DRAFT_TIMEOUT_UNSET;
-	}
-
 	/* NOTE: address_completion_end() does nothing with the window
 	 * however this may change. */
 	address_completion_end(compose->window);
@@ -11577,6 +11572,11 @@ gboolean compose_close(Compose *compose)
 		return FALSE;
 	}
 
+	if (compose->draft_timeout_tag >= 0) {
+		g_source_remove(compose->draft_timeout_tag);
+		compose->draft_timeout_tag = COMPOSE_DRAFT_TIMEOUT_UNSET;
+	}
+
 	gtkut_widget_get_uposition(compose->window, &x, &y);
 	if (!compose->batch) {
 		prefs_common.compose_x = x;