2010-05-14 [colin] 3.7.6cvs5

[claws.git] / src / gtk / sslcertwindow.c

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 6a266a0fd768c3305903a55d0022bc72fc243fde..171b51cda107fea94cb49b9d49e12407310e75a3 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> 
+ * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -136,7 +136,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 
        memset(buf, 0, sizeof(buf));
        if (exp_time_t > 0) {
-               strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
+               fast_strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
                exp_date = (*buf) ? g_strdup(buf):g_strdup("?");
        } else
                exp_date = g_strdup("");
@@ -267,12 +267,15 @@ static gboolean sslcert_ask_hook(gpointer source, gpointer data)
 {
        SSLCertHookData *hookdata = (SSLCertHookData *)source;
 
-       if (prefs_common.skip_ssl_cert_check)
-               return TRUE;
-
        if (hookdata == NULL) {
                return FALSE;
        }
+       
+       if (prefs_common.skip_ssl_cert_check) {
+               hookdata->accept = TRUE;
+               return TRUE;
+       }
+
        if (hookdata->old_cert == NULL) {
                if (hookdata->expired)
                        hookdata->accept = sslcertwindow_ask_expired_cert(hookdata->cert);