delete compose attach property dialog when closed.

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

3 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d343cbdf..3d5eb5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-28
 
+	* src/compose.c: delete attach property dialog when closed.
+
+2008-03-28
+
 	* libsylph/prefs_common.[ch]
 	  src/prefs_common_dialog.c
 	  src/compose.c: the feature to confirm missing attachments was added.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index d8edb8b9..9f5f0352 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2008-03-28
 
+	* src/compose.c: 添付プロパティダイアログを閉じたら削除するように
+	  した。
+
+2008-03-28
+
 	* libsylph/prefs_common.[ch]
 	  src/prefs_common_dialog.c
 	  src/compose.c: 添付ファイル忘れを確認する機能を追加。
diff --git a/src/compose.c b/src/compose.c
index 86323e4a..716021ae 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5694,8 +5694,7 @@ static void compose_attach_property(Compose *compose)
 	g_list_foreach(rows, (GFunc)gtk_tree_path_free, NULL);
 	g_list_free(rows);
 
-	if (!attach_prop.window)
-		compose_attach_property_create(&cancelled);
+	compose_attach_property_create(&cancelled);
 	gtk_widget_grab_focus(attach_prop.ok_btn);
 	gtk_widget_show(attach_prop.window);
 	manage_window_set_transient(GTK_WINDOW(attach_prop.window));
@@ -5729,10 +5728,8 @@ static void compose_attach_property(Compose *compose)
 		cancelled = FALSE;
 		gtk_main();
 
-		if (cancelled == TRUE) {
-			gtk_widget_hide(attach_prop.window);
+		if (cancelled == TRUE)
 			break;
-		}
 
 		entry_text = gtk_entry_get_text
 			(GTK_ENTRY(attach_prop.mimetype_entry));
@@ -5790,10 +5787,11 @@ static void compose_attach_property(Compose *compose)
 				   COL_SIZE, to_human_readable(ainfo->size),
 				   COL_NAME, ainfo->name,
 				   -1);
-
-		gtk_widget_hide(attach_prop.window);
 		break;
 	}
+
+	gtk_widget_destroy(attach_prop.window);
+	memset(&attach_prop, 0, sizeof(attach_prop));
 }
 
 #define SET_LABEL_AND_ENTRY(str, entry, top) \
@@ -5825,7 +5823,7 @@ static void compose_attach_property_create(gboolean *cancelled)
 	GtkWidget *ok_btn;
 	GtkWidget *cancel_btn;
 
-	debug_print("Creating attach_property window...\n");
+	debug_print("Creating attach property window...\n");
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_size_request(window, 480, -1);