fixed a transient window problem.

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

5 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b420db15..e0371c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-05-30
 
+	* src/manage_window.c: manage_window_focus_out(): don't reset
+	  focus_window on focus-out event.
+	* src/inc.c
+	  src/send_message.c: call manage_window_destroy() to reset
+	  focus_window before destruction of window.
+
+2005-05-30
+
 	* src/alertpanel.c: don't let message label take focus.
 	* src/headerview.c: don't let header labels take focus.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 8a853924..2c125b16 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,13 @@
 2005-05-30
 
+	* src/manage_window.c: manage_window_focus_out(): focus-out イベント
+	  で focus_window をリセットしないようにした。
+	* src/inc.c
+	  src/send_message.c: ウィンドウの破壊の前に manage_window_destroy()
+	  を呼んで focus_window をリセットするようにした。
+
+2005-05-30
+
 	* src/alertpanel.c: メッセージラベルがフォーカスを得ないようにした。
 	* src/headerview.c: ヘッダラベルがフォーカスを得ないようにした。
 
diff --git a/src/inc.c b/src/inc.c
index 22262176..de7e9e9f 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -402,6 +402,8 @@ static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
 
 	inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
 
+	manage_window_destroy(inc_dialog->dialog->window, NULL);
+
 	main_window_progress_off(inc_dialog->mainwin);
 	progress_dialog_destroy(inc_dialog->dialog);
 
diff --git a/src/manage_window.c b/src/manage_window.c
index e001c68d..f50f50b0 100644
--- a/src/manage_window.c
+++ b/src/manage_window.c
@@ -42,8 +42,10 @@ gint manage_window_focus_out(GtkWidget *widget, GdkEventFocus *event,
 	/* debug_print("Focused window: %p\n", focus_window); */
 	/* debug_print("Focus out event: window: %p\n", widget); */
 
+#if 0
 	if (focus_window == widget)
 		focus_window = NULL;
+#endif
 
 	return FALSE;
 }
diff --git a/src/send_message.c b/src/send_message.c
index 4ee079c2..5458751d 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -586,6 +586,7 @@ static void send_progress_dialog_destroy(SendProgressDialog *dialog)
 {
 	g_return_if_fail(dialog != NULL);
 
+	manage_window_destroy(dialog->dialog->window, NULL);
 	progress_dialog_destroy(dialog->dialog);
 	g_free(dialog);
 }