enable 'Mark all read' only when selected folder is opened in the case of IMAP4.

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

3 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ef9023bd..d6a7a067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-16
 
+	* src/folderview.c: folderview_menu_popup(): enable "Mark all read"
+	  only when selected folder is opened in the case of IMAP4.
+
+2006-06-16
+
 	* libsylph/procmsg.[ch]
 	  src/folderview.c: added "Mark all read" to the folder context menu.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 52833c42..f3251860 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2006-06-16
 
+	* src/folderview.c: folderview_menu_popup(): IMAP4 の場合選択された
+	  フォルダが開いている場合のみ「すべて読んだことにする」を有効にする
+	  ようにした。
+
+2006-06-16
+
 	* libsylph/procmsg.[ch]
 	  src/folderview.c: フォルダのコンテキストメニューに「すべて読んだ
 	  ことにする」を追加。
diff --git a/src/folderview.c b/src/folderview.c
index 44c4c442..801a71b1 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1626,10 +1626,13 @@ static gboolean folderview_menu_popup(FolderView *folderview,
 		if (item->parent == NULL) {
 			update_tree = remove_tree = TRUE;
 		} else {
+			if (FOLDER_TYPE(folder) != F_IMAP)
+				mark_all_read = TRUE;
 			if (gtkut_tree_row_reference_equal
-				(folderview->selected, folderview->opened))
+				(folderview->selected, folderview->opened)) {
 				update_summary = TRUE;
-			mark_all_read = TRUE;
+				mark_all_read = TRUE;
+			}
 		}
 		if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP) {
 			if (item->parent == NULL)