aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-11-02 08:33:16 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-11-02 08:33:16 +0000
commit8bf78e2e3fed38cd4fe983dba15002a4ca6d762f (patch)
tree52c3330511b1238a5ad67a07c523e8b44105a72d
parent8a007108e4ae652ff4138aaa48220caae53b3b93 (diff)
compose.c: stop watching of child process in case something weird happened.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@707 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--src/compose.c7
3 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97bfa307..0c416679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-11-02
+ * src/compose.c: compose_ext_editor_kill(): stop watching of child
+ process in case something weird happened.
+
+2005-11-02
+
* src/compose.c: fixed for win32.
2005-11-02
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 150a85da..ea316848 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
2005-11-02
+ * src/compose.c: compose_ext_editor_kill(): 変なことが起こった場合、
+ 子プロセスの監視を止めるようにした。
+
+2005-11-02
+
* src/compose.c: win32 用の修正。
2005-11-02
diff --git a/src/compose.c b/src/compose.c
index bb58dd47..562f8aea 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5218,6 +5218,13 @@ static gboolean compose_ext_editor_kill(Compose *compose)
gtk_main_iteration();
} else
return FALSE;
+ } 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;
+ compose->exteditor_pid = 0;
+ compose_set_ext_editor_sensitive(compose, TRUE);
}
return TRUE;