aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/mainwindow.c4
-rw-r--r--src/summaryview.c4
4 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 81d45c73..a99d7f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-05-12
+ * src/summaryview.c: summary_attract_by_subject()
+ src/mainwindow.c: main_window_set_menu_sensitive(): disable 'Attract
+ by subject' if sorted.
+
+2005-05-12
+
* src/summaryview.c: summary_attract_by_subject(): optimized using
gtk_tree_store_reorder() (gtk_tree_store_move_after() is too slow).
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 1a264b20..28e4f7d1 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2005-05-12
+ * src/summaryview.c: summary_attract_by_subject()
+ src/mainwindow.c: main_window_set_menu_sensitive(): ソートされて
+ いる場合は「件名で寄せる」を無効にするようにした。
+
+2005-05-12
+
* src/summaryview.c: summary_attract_by_subject():
gtk_tree_store_reorder() を使用して最適化
(gtk_tree_store_move_after() は遅すぎ)。
diff --git a/src/mainwindow.c b/src/mainwindow.c
index a2b0fa1e..fefc77ba 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1871,9 +1871,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
if (item && item->sort_key != SORT_BY_NONE) {
menu_set_sensitive(ifactory, "/View/Sort/Ascending", TRUE);
menu_set_sensitive(ifactory, "/View/Sort/Descending", TRUE);
+ menu_set_sensitive(ifactory, "/View/Sort/Attract by subject",
+ FALSE);
} else {
menu_set_sensitive(ifactory, "/View/Sort/Ascending", FALSE);
menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
+ menu_set_sensitive(ifactory, "/View/Sort/Attract by subject",
+ (item != NULL));
}
SET_CHECK_MENU_ACTIVE("/View/Show all header",
diff --git a/src/summaryview.c b/src/summaryview.c
index 271ed552..c23bae7e 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1400,6 +1400,10 @@ void summary_attract_by_subject(SummaryView *summaryview)
gint count, i;
gint *new_order;
+ if (summaryview->folder_item &&
+ summaryview->folder_item->sort_key != SORT_BY_NONE)
+ return;
+
valid = gtk_tree_model_get_iter_first(model, &iter);
if (!valid)
return;