fixed a problem that the UI was still insensitive after execution of external editor failed.

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

3 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a596cef3..f14b56db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-02-07
 
+	* src/compose.c: compose_exec_ext_editor(): fixed a problem that the
+	  UI was still insensitive after execution of external editor failed
+	  (thanks to M.Suzuki).
+
+2006-02-07
+
 	* src/tryaicon.c: trayicon_button_pressed(): use gtk_widget_iconify()
 	  instead of gtk_widget_hide() (fixes some problems).
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 11bb748b..77c7bd75 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2006-02-07
 
+	* src/compose.c: compose_exec_ext_editor(): 外部エディタの実行に失敗
+	  した後 UI が無効になっていた問題を修正(M.Suzuki さん thanks)。
+
+2006-02-07
+
 	* src/tryaicon.c: trayicon_button_pressed(): gtk_widget_hide() の
 	  代わりに gtk_widget_iconify() を使用(いくつかの問題を修正)。
 
diff --git a/src/compose.c b/src/compose.c
index b6e5faac..bd4544d7 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5440,8 +5440,6 @@ static void compose_exec_ext_editor(Compose *compose)
 	}
 #endif
 
-	compose_set_ext_editor_sensitive(compose, FALSE);
-
 	if (prefs_common.ext_editor_cmd &&
 	    (p = strchr(prefs_common.ext_editor_cmd, '%')) &&
 	    *(p + 1) == 's' && !strchr(p + 2, '%')) {
@@ -5464,6 +5462,8 @@ static void compose_exec_ext_editor(Compose *compose)
 		return;
 	}
 
+	compose_set_ext_editor_sensitive(compose, FALSE);
+
 	debug_print("compose_exec_ext_editor(): pid: %d file: %s\n", pid, tmp);
 
 	compose->exteditor_file = tmp;