2005-11-17 [wwp] 1.9.100cvs16
authorTristan Chabredier <wwp@claws-mail.org>
Fri, 18 Nov 2005 00:48:55 +0000 (00:48 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Fri, 18 Nov 2005 00:48:55 +0000 (00:48 +0000)
fix possible problem showing some quicksearch buttons, and a bad
call to g_return_if_fail in a function that returns a value (both
fixes by Fabien Vantard)

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

index 1b4508b..2dea6ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17 [wwp]       1.9.100cvs16
+               fix possible problem showing some quicksearch buttons, and a bad
+               call to g_return_if_fail in a function that returns a value (both
+               fixes by Fabien Vantard)
+
 2005-11-15 [wwp]       1.9.100cvs15
 
        * src/gtk/quicksearch.c
index b152521..9f75156 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.18.2.12 -r 1.18.2.13 src/plugins/spamassassin/spamassassin.c;  ) > 1.9.100cvs13.patchset
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/quicksearch.c;  ) > 1.9.100cvs14.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/gtk/quicksearch.c;  ) > 1.9.100cvs15.patchset
+( ) > 1.9.100cvs16.patchset
index 4c9f392..88c43ee 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index de1b587..a421151 100644 (file)
@@ -325,8 +325,9 @@ static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
        const gchar * cond_str;
        MatcherList * matchers = NULL;
 
-       g_return_if_fail(
-                       mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
+       g_return_val_if_fail(
+                       mainwindow_get_mainwindow()->summaryview->quicksearch != NULL,
+                       FALSE);
 
        /* re-use it the current quicksearch value if it's a condition expression,
           otherwise ignore it silently */
@@ -449,10 +450,9 @@ QuickSearch *quicksearch_new()
        search_description = gtk_button_new_with_label(_("Extended Symbols"));
        gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
                           FALSE, FALSE, 0);
-       gtk_widget_show(search_description);
-               
        g_signal_connect(G_OBJECT(search_description), "clicked",
                         G_CALLBACK(search_description_cb), NULL);
+       gtk_widget_show(search_description);
 
        gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);                         
        gtk_widget_show(search_hbox);
@@ -479,7 +479,6 @@ QuickSearch *quicksearch_new()
                         "focus_out_event",
                         G_CALLBACK(searchbar_focus_evt),
                         quicksearch);
-       
 
        quicksearch->hbox_search = hbox_search;
        quicksearch->search_type = search_type;