fix breakage caused by last commit

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8b7f8855c9e1be64ee940c2e473990ca5319609b..71d2f62a8c1d84fd45350f82f7fdadf7d3b77fc9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-11-25 [paul]      0.8.6claws9
+
+       * src/prefs_common.[ch]
+               fix breakage caused by last commit
+

 2002-11-25 [paul]      0.8.6claws8
 
        * sync with 0.8.6cvs4
 2002-11-25 [paul]      0.8.6claws8
 
        * sync with 0.8.6cvs4

diff --git a/configure.in b/configure.in
index ca53e2b1f94492758cc09494e4f4cb326882a2a3..e93649ee5031faccb3461db66562e67337708038 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws8
+EXTRA_VERSION=claws9

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 74f0dc9c8528b8d771d4b9e58bd9fb65dd348c4e..c0353744fb293060dae4d77c4febbd7e44fd5ee7 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -239,7 +239,9 @@ static struct Other {
        GtkWidget *checkbtn_warnqueued;
         GtkWidget *checkbtn_cliplog;
         GtkWidget *loglength_entry;
        GtkWidget *checkbtn_warnqueued;
         GtkWidget *checkbtn_cliplog;
         GtkWidget *loglength_entry;

-
+#ifdef USE_SSL
+       GtkWidget *checkbtn_ssl_ask_unknown_valid;
+#endif

 } other;
 
 static struct MessageColorButtons {
 } other;
 
 static struct MessageColorButtons {


@@ -802,6 +804,11 @@ static PrefParam param[] = {
        {"warn_queued_on_exit", "TRUE", &prefs_common.warn_queued_on_exit,
         P_BOOL, &other.checkbtn_warnqueued,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"warn_queued_on_exit", "TRUE", &prefs_common.warn_queued_on_exit,
         P_BOOL, &other.checkbtn_warnqueued,
         prefs_set_data_from_toggle, prefs_set_toggle},

+#ifdef USE_SSL
+       {"ssl_ask_unknown_valid", "TRUE", &prefs_common.ssl_ask_unknown_valid,
+        P_BOOL, &other.checkbtn_ssl_ask_unknown_valid,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+#endif

        {"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
         NULL, NULL, NULL},
 
        {"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
         NULL, NULL, NULL},
 


@@ -2880,7 +2887,12 @@ static void prefs_other_create(void)
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;

-
+#ifdef USE_SSL 
+       GtkWidget *frame_ssl;
+       GtkWidget *vbox_ssl;
+       GtkWidget *hbox_ssl;
+       GtkWidget *checkbtn_ssl_ask_unknown_valid;
+#endif

        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);


@@ -2978,6 +2990,21 @@ static void prefs_other_create(void)
                            FALSE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_entry);
 
                            FALSE, TRUE, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_cliplog, loglength_entry);
 

+#ifdef USE_SSL
+       /* SSL */
+       PACK_FRAME (vbox1, frame_ssl, _("Security"));
+
+       vbox_ssl = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox_ssl);
+       gtk_container_add (GTK_CONTAINER (frame_ssl), vbox_ssl);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox_ssl), 8);
+       PACK_CHECK_BUTTON (vbox_ssl, checkbtn_ssl_ask_unknown_valid, 
+                          _("Confirm acception of all SSL certificates"));
+       hbox_ssl = gtk_hbox_new (FALSE, 3);
+       gtk_container_add (GTK_CONTAINER (vbox_ssl), hbox_ssl);
+       gtk_widget_show (hbox_ssl);
+#endif
+       

        /* On Exit */
        PACK_FRAME (vbox1, frame_exit, _("On exit"));
 
        /* On Exit */
        PACK_FRAME (vbox1, frame_exit, _("On exit"));
 


@@ -3016,6 +3043,10 @@ static void prefs_other_create(void)
        other.checkbtn_cleanonexit = checkbtn_cleanonexit;
        other.checkbtn_askonclean  = checkbtn_askonclean;
        other.checkbtn_warnqueued  = checkbtn_warnqueued;
        other.checkbtn_cleanonexit = checkbtn_cleanonexit;
        other.checkbtn_askonclean  = checkbtn_askonclean;
        other.checkbtn_warnqueued  = checkbtn_warnqueued;

+       
+#ifdef USE_SSL
+       other.checkbtn_ssl_ask_unknown_valid = checkbtn_ssl_ask_unknown_valid;
+#endif

 }
 
 static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
 }
 
 static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 3fe515ea0f5fa8fe66d72463588d50e70932f116..2ac26d3a05642a0fea9051ce179c161a25baa66d 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -251,7 +251,9 @@ struct _PrefsCommon
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;

-
+#ifdef USE_SSL
+       gboolean ssl_ask_unknown_valid;
+#endif

        /* Memory cache*/
        gint cache_max_mem_usage;
        gint cache_min_keep_time;
        /* Memory cache*/
        gint cache_max_mem_usage;
        gint cache_min_keep_time;