2005-11-18 [wwp] 1.9.100cvs21
authorTristan Chabredier <wwp@claws-mail.org>
Fri, 18 Nov 2005 13:35:09 +0000 (13:35 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Fri, 18 Nov 2005 13:35:09 +0000 (13:35 +0000)
* src/gtk/quicksearch.c
don't update extended quicksearch buttons twice

ChangeLog
PATCHSETS
configure.ac
src/gtk/quicksearch.c

index a10b462..a0ebebf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-18 [wwp]       1.9.100cvs21
+
+       * src/gtk/quicksearch.c
+               don't update extended quicksearch buttons twice
+
 2005-11-18 [paul]      1.9.100cvs20
 
        * src/textview.c
index e93ce56..90767b0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.395.2.148 -r 1.395.2.149 src/summaryview.c;  ) > 1.9.100cvs18.patchset
 ( cvs diff -u -r 1.382.2.193 -r 1.382.2.194 src/compose.c;  cvs diff -u -r 1.96.2.84 -r 1.96.2.85 src/textview.c;  ) > 1.9.100cvs19.patchset
 ( cvs diff -u -r 1.96.2.85 -r 1.96.2.86 src/textview.c;  ) > 1.9.100cvs20.patchset
+( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/gtk/quicksearch.c;  ) > 1.9.100cvs21.patchset
index 5532af9..d3fd947 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a421151..93ea87f 100644 (file)
@@ -114,7 +114,6 @@ static void update_extended_buttons (QuickSearch *quicksearch)
                gtk_widget_hide(expr_btn);
                gtk_widget_hide(ext_btn);
        }
-       
 }
 
 static gboolean searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
@@ -456,25 +455,15 @@ QuickSearch *quicksearch_new()
 
        gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);                         
        gtk_widget_show(search_hbox);
-       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
-               gtk_widget_show(search_condition_expression);
-               gtk_widget_show(search_description);
-       } else {
-               gtk_widget_hide(search_condition_expression);
-               gtk_widget_hide(search_description);
-       }
        
        g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry), 
                           "key_press_event",
                           G_CALLBACK(searchbar_pressed),
                           quicksearch);
-
-       
        g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
                         "focus_in_event",
                         G_CALLBACK(searchbar_focus_evt),
                         quicksearch);
-
        g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
                         "focus_out_event",
                         G_CALLBACK(searchbar_focus_evt),