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)

diff --git a/ChangeLog b/ChangeLog
index 1b4508bc0b9f9c21d1da4caeff06f456d91d4cd1..2dea6eab7fa8aa029819a882c24bec8303f4821f 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

diff --git a/PATCHSETS b/PATCHSETS
index b1525218ea0f3f7d553441caa27bc0fcc357a335..9f751560a876fad99bbc8f4173e4d3bebbbea7bd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -999,3 +999,4 @@
 ( 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

diff --git a/configure.ac b/configure.ac
index 4c9f392e58ef66887941e94cf8d685bb078b4ac6..88c43eeec0fb27b97112f4194eacbeb54ee2e90c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index de1b587bff8a379b54f1b0e60ebd51cb98edc302..a421151cdac37d0c2950a61d9ec71e03a5d0dc33 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -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;