2007-02-21 [colin] 2.7.2cvs60

[claws.git] / src / gtk / quicksearch.c

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 25714a5761d77565ef91ccf61c57618c2d8bb77e..4062b77b7de6a0b5e5cc941165e02efb1466fac3 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -1,6 +1,7 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> 
+ * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,6 +71,7 @@ struct _QuickSearch
 static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
 static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active);
 static void quicksearch_reset_folder_items(QuickSearch *quicksearch, FolderItem *folder_item);
+static gchar *expand_search_string(const gchar *str);
 
 gboolean quicksearch_is_fast(QuickSearch *quicksearch)
 {
@@ -669,17 +671,34 @@ GtkWidget *quicksearch_get_widget(QuickSearch *quicksearch)
 
 void quicksearch_show(QuickSearch *quicksearch)
 {
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       GtkWidget *ctree = NULL;
        prepare_matcher(quicksearch);
        gtk_widget_show(quicksearch->hbox_search);
        update_extended_buttons(quicksearch);
        gtk_widget_grab_focus(
                GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
+
+       GTK_EVENTS_FLUSH();
+
+       if (!mainwin || !mainwin->summaryview) {
+               return;
+       }
+       
+       ctree = summary_get_main_widget(mainwin->summaryview);
+       
+       if (ctree && mainwin->summaryview->selected)
+               gtk_ctree_node_moveto(GTK_CTREE(ctree), 
+                               mainwin->summaryview->selected, 
+                               0, 0.5, 0);
 }
 
 void quicksearch_hide(QuickSearch *quicksearch)
 {
-       quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
-       quicksearch_set_active(quicksearch, FALSE);
+       if (quicksearch_is_active(quicksearch)) {
+               quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
+               quicksearch_set_active(quicksearch, FALSE);
+       }
        gtk_widget_hide(quicksearch->hbox_search);
 }
 
@@ -820,7 +839,7 @@ gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
 }
 
 /* allow Mutt-like patterns in quick search */
-gchar *expand_search_string(const gchar *search_string)
+static gchar *expand_search_string(const gchar *search_string)
 {
        int i = 0;
        gchar term_char, save_char;
@@ -1071,11 +1090,9 @@ static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch,
                MsgInfo *msg = (MsgInfo *)cur->data;
                statusbar_progress_all(num++,total, interval);
                if (quicksearch_match(quicksearch, msg)) {
-                       procmsg_msginfo_free(msg);
                        result = TRUE;
                        break;
                }
-               procmsg_msginfo_free(msg);
                if (num % interval == 0)
                        GTK_EVENTS_FLUSH();
                if (!quicksearch_is_active(quicksearch))
@@ -1085,7 +1102,7 @@ static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch,
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 
-       g_slist_free(msglist);
+       procmsg_msg_list_free(msglist);
        return result;
 }