src/compose.c: unlink compose->exteditor_file if exist.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@708 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c416679..ebf87161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-02
 
+	* src/compose.c: unlink compose->exteditor_file if exist.
+
+2005-11-02
+
 	* src/compose.c: compose_ext_editor_kill(): stop watching of child
 	  process in case something weird happened.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index ea316848..6d452ec8 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-11-02
 
+	* src/compose.c: compose->exteditor_file が存在すれば unlink する
+	  ようにした。
+
+2005-11-02
+
 	* src/compose.c: compose_ext_editor_kill(): 変なことが起こった場合、
 	  子プロセスの監視を止めるようにした。
 
diff --git a/src/compose.c b/src/compose.c
index 562f8aea..e18e0a71 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4778,7 +4778,10 @@ static void compose_destroy(Compose *compose)
 	if (compose->undostruct)
 		undo_destroy(compose->undostruct);
 
-	g_free(compose->exteditor_file);
+	if (compose->exteditor_file) {
+		g_unlink(compose->exteditor_file);
+		g_free(compose->exteditor_file);
+	}
 
 	for (valid = gtk_tree_model_get_iter_first(model, &iter); valid;
 	     valid = gtk_tree_model_iter_next(model, &iter)) {
@@ -5221,8 +5224,11 @@ static gboolean compose_ext_editor_kill(Compose *compose)
 	} else if (compose->exteditor_tag != 0) {
 		g_source_remove(compose->exteditor_tag);
 		compose->exteditor_tag = 0;
-		g_free(compose->exteditor_file);
-		compose->exteditor_file = NULL;
+		if (compose->exteditor_file) {
+			g_unlink(compose->exteditor_file);
+			g_free(compose->exteditor_file);
+			compose->exteditor_file = NULL;
+		}
 		compose->exteditor_pid  = 0;
 		compose_set_ext_editor_sensitive(compose, TRUE);
 	}