* tools/Makefile.am

	remove launch_firebird and add nautilus2sylpheed.sh
* src/quicksearch.c
  src/summaryview.c
	Fix show/hide "Extended symbols" button problem
	Fix apparition at startup
	Fix const warnings
* src/plugins/image_viewer/Makefile.am
	Fix configure
* common/ssl.c
	Re-enable certificate check, as it doesn't seem to
	cause Xlib errors anymore

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 95e59db61a5ada0bf61cd592b5c8f019d1c1f280..fd65765509e29d7a815178bf0b05019edd7df3ec 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,18 @@
+2004-06-26 [colin]     0.9.11cvs17.1
+       
+       * tools/Makefile.am
+               remove launch_firebird and add nautilus2sylpheed.sh
+       * src/quicksearch.c
+         src/summaryview.c
+               Fix show/hide "Extended symbols" button problem
+               Fix apparition at startup
+               Fix const warnings
+       * src/plugins/image_viewer/Makefile.am
+               Fix configure 
+       * common/ssl.c
+               Re-enable certificate check, as it doesn't seem to
+               cause Xlib errors anymore
+
 2004-06-25 [paul]      0.9.11cvs17
 
        * sync with 0.9.11cvs17 HEAD

diff --git a/configure.ac b/configure.ac
index ed5b52680e44366e0bce8c18931a27e4c8e17a81..569d66e1d7b75060b7cefd23beac6407642f16d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=17.1
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/common/ssl.c b/src/common/ssl.c
index f6121da6df794d9f5d3d592a6299982fd07c6b4e..07eeea94fea6cec058c92efb02e801c448de1374 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -110,13 +110,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
                return FALSE;
        }
 
-/*
+
        if (!ssl_certificate_check(server_cert, sockinfo->hostname, sockinfo->port)) {
                X509_free(server_cert);
                SSL_free(ssl);
                return FALSE;
        }
-*/
+
 
        X509_free(server_cert);
        sockinfo->ssl = ssl;

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 2ce94bd23d74de3473841bc963cd7356af41d3ce..8a88bcac1f91ea9e9ce2bbd467d3ac20c677940b 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -51,7 +51,7 @@ struct _QuickSearch
 
 static void prepare_matcher(QuickSearch *quicksearch)
 {
-       gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+       const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
 
        if (quicksearch->matcher_list != NULL) {
                matcherlist_free(quicksearch->matcher_list);
@@ -85,11 +85,26 @@ static void prepare_matcher(QuickSearch *quicksearch)
        quicksearch->active = TRUE;
 }
 
+static void update_extended_button (QuickSearch *quicksearch)
+{
+       GtkWidget *btn = quicksearch->search_description;
+       
+       g_return_if_fail(btn != NULL);
+               
+       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
+               gtk_button_set_label(GTK_BUTTON(btn), _("Extended symbols"));
+               gtk_widget_show(btn);
+       } else {
+               gtk_widget_hide(btn);
+       }
+       
+}
+
 static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                  QuickSearch *quicksearch)
 {
        if (event != NULL && event->keyval == GDK_Return) {
-               gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+               const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
 
                if (search_string && strlen(search_string) != 0) {
                        prefs_common.summary_quicksearch_history =
@@ -119,12 +134,7 @@ static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
                                   GTK_MENU(quicksearch->search_type)))), MENU_VAL_ID));
 
        /* Show extended search description button, only when Extended is selected */
-       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
-               gtk_widget_show(quicksearch->search_description);
-       } else {
-               gtk_widget_hide(quicksearch->search_description);
-
-       }
+       update_extended_button(quicksearch);
 
        prepare_matcher(quicksearch);
 
@@ -268,10 +278,6 @@ QuickSearch *quicksearch_new()
                         G_CALLBACK(search_description_cb), NULL);
        gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);                                
        gtk_widget_show(search_hbbox);
-       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED)
-               gtk_widget_show(search_description);
-       else
-               gtk_widget_hide(search_description);
 
        gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry), 
                           "key_press_event",
@@ -298,6 +304,8 @@ QuickSearch *quicksearch_new()
        quicksearch->matcher_list = NULL;
        quicksearch->active = FALSE;
 
+       update_extended_button(quicksearch);
+       
        return quicksearch;
 }
 
@@ -310,6 +318,7 @@ void quicksearch_show(QuickSearch *quicksearch)
 {
        prepare_matcher(quicksearch);
        gtk_widget_show(quicksearch->hbox_search);
+       update_extended_button(quicksearch);
 }
 
 void quicksearch_hide(QuickSearch *quicksearch)

diff --git a/src/plugins/image_viewer/Makefile.am b/src/plugins/image_viewer/Makefile.am
index 464c826740e5c203cd48de30e83d1434149dcbb0..55ea00fc128a9f170fc9c471c23e13babc9ecc22 100644 (file)
--- a/src/plugins/image_viewer/Makefile.am
+++ b/src/plugins/image_viewer/Makefile.am
@@ -9,8 +9,7 @@ image_viewer_la_SOURCES = \
 
 image_viewer_la_LDFLAGS = \
        -avoid-version -module \
-       $(GTK_LIBS) \
-       $(GDK_PIXBUF_LIBS)
+       $(GTK_LIBS) 
 
 INCLUDES = \
        -I../.. \

diff --git a/src/summaryview.c b/src/summaryview.c
index 15b4677fa0b9adc7c240624108edd51f341c11eb..b05bcc2bb063300602e8204b342d414d860c14ff 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -558,10 +558,7 @@ SummaryView *summary_create(void)
        /* quick search */
        quicksearch = quicksearch_new();
        gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
-       if (prefs_common.show_searchbar)
-               quicksearch_show(quicksearch);
-       else
-               quicksearch_hide(quicksearch);
+
        quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
 
        g_signal_connect (G_OBJECT(toggle_search), "toggled",
@@ -603,6 +600,11 @@ SummaryView *summary_create(void)
 
        gtk_widget_show(vbox);
 
+       if (prefs_common.show_searchbar)
+               quicksearch_show(quicksearch);
+       else
+               quicksearch_hide(quicksearch);
+       
        return summaryview;
 }