fixes blank message view is always appears on window popup.

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

3 files changed, 28 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 25226f4c..05e7683d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-19
+
+	* version 2.3.0rc
+
+2006-12-19
+
+	* src/mainwindow.c: main_window_popup(): follow the current visibility
+	  state in separate window mode (fixes blank message view is always
+	  appears on window popup).
+
 2006-12-18
 
 	* libsylph/ssl.c: ssl_init(): call SSL_CTX_load_verify_locations()
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 4a10173b..1f0447ab 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,13 @@
+2006-12-19
+
+	* version 2.3.0rc
+
+2006-12-19
+
+	* src/mainwindow.c: main_window_popup(): 分離ウィンドウモードで
+	  現在の表示状態に従うようにした(分離状態でウィンドウのポップアップ
+	  時に常に空白のメッセージビューが表示されるのを修正)。
+
 2006-12-18
 
 	* libsylph/ssl.c: ssl_init(): certs_file のみ存在するばあいでも
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 3d630928..9ce5374f 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2099,14 +2099,18 @@ void main_window_popup(MainWindow *mainwin)
 
 	switch (mainwin->type) {
 	case SEPARATE_FOLDER:
-		gtkut_window_popup(mainwin->win.sep_folder.folderwin);
+		if (prefs_common.folderview_visible)
+			gtkut_window_popup(mainwin->win.sep_folder.folderwin);
 		break;
 	case SEPARATE_MESSAGE:
-		gtkut_window_popup(mainwin->win.sep_message.messagewin);
+		if (messageview_is_visible(mainwin->messageview))
+			gtkut_window_popup(mainwin->win.sep_message.messagewin);
 		break;
 	case SEPARATE_BOTH:
-		gtkut_window_popup(mainwin->win.sep_both.folderwin);
-		gtkut_window_popup(mainwin->win.sep_both.messagewin);
+		if (prefs_common.folderview_visible)
+			gtkut_window_popup(mainwin->win.sep_both.folderwin);
+		if (messageview_is_visible(mainwin->messageview))
+			gtkut_window_popup(mainwin->win.sep_both.messagewin);
 		break;
 	default:
 		break;