popup main window if edit account dialog is not present.

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

3 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fe6bf743..0b678079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-11-14
 
+	* src/account_dialog.c: account_open(): popup main window if edit
+	  account dialog is not present.
+
+2005-11-14
+
 	* src/mimeview.c: mimeview_view_file(): win32: use g_file_test() to
 	  detect common executable suffix.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index c845d5ba..f4d70461 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-11-14
 
+	* src/account_dialog.c: account_open(): アカウント編集ダイアログが
+	  表示されていない場合はメインウィンドウをポップアップするようにした。
+
+2005-11-14
+
 	* src/mimeview.c: mimeview_view_file(): win32: 一般的な実行ファイルの
 	  拡張子は g_file_test() で検出するようにした。
 
diff --git a/src/account_dialog.c b/src/account_dialog.c
index 910e35c1..c93ff11e 100644
--- a/src/account_dialog.c
+++ b/src/account_dialog.c
@@ -207,7 +207,10 @@ void account_open(PrefsAccount *ac_prefs)
 		  return);
 
 	prefs_account_open(ac_prefs);
-	gtk_window_present(GTK_WINDOW(edit_account.window));
+	if (edit_account.window && GTK_WIDGET_VISIBLE(edit_account.window))
+		gtk_window_present(GTK_WINDOW(edit_account.window));
+	else
+		main_window_popup(main_window_get());
 
 	if (!prev_default && ac_prefs->is_default)
 		account_set_as_default(ac_prefs);