From ae7410085aba0ce700c903d140fcbf9ae8820f91 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 3 Jun 2008 18:27:47 +0000 Subject: [PATCH] 2008-06-03 [colin] 3.4.0cvs80 * src/mainwindow.c * src/mainwindow.h Fix bug 1624, '[PATCH] Quick search should be disabled for folder view'; based on a patch by Michael Terry --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mainwindow.c | 6 ++++++ src/mainwindow.h | 3 ++- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 355f125bc..a0cee981f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-03 [colin] 3.4.0cvs80 + + * src/mainwindow.c + * src/mainwindow.h + Fix bug 1624, '[PATCH] Quick search should be + disabled for folder view'; based on a patch by + Michael Terry + 2008-06-03 [iwkse] 3.4.0cvs79 * src/addressbook.c diff --git a/PATCHSETS b/PATCHSETS index ab09d6f95..743978883 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3375,3 +3375,4 @@ ( cvs diff -u -r 1.8.2.34 -r 1.8.2.35 src/quote_fmt.c; ) > 3.4.0cvs77.patchset ( cvs diff -u -r 1.60.2.56 -r 1.60.2.57 src/prefs_actions.c; ) > 3.4.0cvs78.patchset ( cvs diff -u -r 1.60.2.116 -r 1.60.2.117 src/addressbook.c; cvs diff -u -r 1.94.2.178 -r 1.94.2.179 src/messageview.c; cvs diff -u -r 1.204.2.170 -r 1.204.2.171 src/prefs_common.c; cvs diff -u -r 1.103.2.108 -r 1.103.2.109 src/prefs_common.h; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_message.c; ) > 3.4.0cvs79.patchset +( cvs diff -u -r 1.274.2.245 -r 1.274.2.246 src/mainwindow.c; cvs diff -u -r 1.39.2.46 -r 1.39.2.47 src/mainwindow.h; ) > 3.4.0cvs80.patchset diff --git a/configure.ac b/configure.ac index 15db09f79..05b648278 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=79 +EXTRA_VERSION=80 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index 8137e66d8..996dbc652 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2752,6 +2752,9 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin) if (summary_is_list(mainwin->summaryview)) state |= M_SUMMARY_ISLIST; + if (prefs_common.layout_mode != SMALL_LAYOUT || mainwin->in_folder) + state |= M_IN_MSGLIST; + return state; } @@ -2781,6 +2784,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) {"/Edit/Select thread" , M_TARGET_EXIST|M_SUMMARY_ISLIST}, {"/Edit/Delete thread" , M_TARGET_EXIST|M_SUMMARY_ISLIST}, {"/Edit/Find in current message...", M_SINGLE_TARGET_EXIST}, + {"/Edit/Quick search", M_IN_MSGLIST}, {"/View/Set displayed columns/in Folder list..." , M_UNLOCKED|M_SUMMARY_ISLIST}, @@ -4713,6 +4717,7 @@ void mainwindow_exit_folder(MainWindow *mainwin) { gtk_widget_grab_focus(mainwin->folderview->ctree); } mainwin->in_folder = FALSE; + main_window_set_menu_sensitive(mainwin); } void mainwindow_enter_folder(MainWindow *mainwin) { @@ -4720,6 +4725,7 @@ void mainwindow_enter_folder(MainWindow *mainwin) { mainwin_paned_show_last(GTK_PANED(mainwin->hpaned)); } mainwin->in_folder = TRUE; + main_window_set_menu_sensitive(mainwin); } #ifdef MAEMO diff --git a/src/mainwindow.h b/src/mainwindow.h index f5e57f8bc..672df6e29 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -60,7 +60,8 @@ typedef enum M_WANT_SYNC = 1 << 19, M_TAGS_EXIST = 1 << 20, M_HAVE_PROCESSING = 1 << 21, - M_SUMMARY_ISLIST = 1 << 22 + M_SUMMARY_ISLIST = 1 << 22, + M_IN_MSGLIST = 1 << 23 } SensitiveCond; typedef enum -- 2.25.1