Revert ga0fbaac (3.14.1-88) as it gets things worse in folder search,

[claws.git] / src / summary_search.c

diff --git a/src/summary_search.c b/src/summary_search.c
index e4ff06d8e190fd444d107533b5982ccaa1194217..67d22a481a9d92fc702d152da74302c35ab94fb6 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -145,27 +145,13 @@ static gboolean adv_condition_entry_focus_evt_in(GtkWidget *widget, GdkEventFocu
                                  gpointer data);
 static gboolean adv_condition_entry_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
                                  gpointer data);
-#ifndef MAEMO
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
-#endif
 
-#if !GTK_CHECK_VERSION(2,14,0)
-/* Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 */
-#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {                                   \
-       gboolean in_btn = FALSE;                                                        \
-       if (GTK_IS_BUTTON(widget))                                                      \
-               in_btn = GTK_BUTTON(widget)->in_button;                                 \
-       gtk_widget_set_sensitive(widget, sensitive);                                    \
-       if (GTK_IS_BUTTON(widget))                                                      \
-               GTK_BUTTON(widget)->in_button = in_btn;                                 \
-}
-#else
 #define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {                                   \
        gtk_widget_set_sensitive(widget, sensitive);                                    \
 }
-#endif
 
 static gchar* add_history_get(GtkWidget *from, GList **history)
 {
@@ -275,12 +261,8 @@ static void summary_search_create(void)
        gtk_container_set_border_width(GTK_CONTAINER (window), 8);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(gtk_widget_hide_on_delete), NULL);
-#ifdef MAEMO
-       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
-#else
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), NULL);
-#endif
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
 
        vbox1 = gtk_vbox_new (FALSE, 0);
@@ -577,9 +559,6 @@ static void summary_search_create(void)
        search_window.search_in_progress = FALSE;
        search_window.matched_msgnums = NULL;
        search_window.is_searching = is_searching;
-#ifdef MAEMO
-       maemo_window_full_screen_if_needed(GTK_WINDOW(search_window.window));
-#endif
 }
 
 static gboolean summary_search_verify_match(MsgInfo *msg)
@@ -828,7 +807,10 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
 
                msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
-               matched = summary_search_verify_match(msginfo);
+               if (msginfo)
+                       matched = summary_search_verify_match(msginfo);
+               else
+                       matched = FALSE;
 
                if (matched) {
                        if (search_all) {
@@ -836,10 +818,10 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                        } else {
                                if (messageview_is_visible(summaryview->messageview)) {
                                        summary_unlock(summaryview);
-                                       summary_select_node(summaryview, node, TRUE, TRUE);
+                                       summary_select_node(summaryview, node, 1);
                                        summary_lock(summaryview);
                                } else {
-                                       summary_select_node(summaryview, node, FALSE, TRUE);
+                                       summary_select_node(summaryview, node, 0);
                                }
                                break;
                        }
@@ -858,7 +840,7 @@ exit:
        summary_hide_stop_button();
        main_window_cursor_normal(summaryview->mainwin);
        if (search_all) {
-               summary_thaw(summaryview);
+               summary_thaw_with_status(summaryview);
        }
        summary_unlock(summaryview);
 }
@@ -1050,7 +1032,7 @@ static gboolean adv_condition_entry_focus_evt_out(GtkWidget *widget, GdkEventFoc
        search_window.adv_condition_entry_has_focus = FALSE;
        return FALSE;
 }
-#ifndef MAEMO
+
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                            gpointer data)
 {
@@ -1107,4 +1089,3 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        return FALSE;
 }
-#endif