Ignore:
Timestamp:
Jan 9, 2017, 11:09:38 AM (3 years ago)
Author:
jrpelegrina
Message:

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/interface/verifycertdialog.cpp

    r130 r3185  
    2828{
    2929        bool warning = false;
    30         if (cert.GetActivationTime().IsValid()) {
    31                 if (cert.GetActivationTime() > CDateTime::Now()) {
     30        if (cert.GetActivationTime().empty()) {
     31                if (cert.GetActivationTime() > fz::datetime::now()) {
    3232                        pDlg->SetChildLabel(XRCID("ID_ACTIVATION_TIME"), wxString::Format(_("%s - Not yet valid!"), CTimeFormat::Format(cert.GetActivationTime())));
    3333                        xrc_call(*pDlg, "ID_ACTIVATION_TIME", &wxWindow::SetForegroundColour, wxColour(255, 0, 0));
     
    4242        }
    4343
    44         if (cert.GetExpirationTime().IsValid()) {
    45                 if (cert.GetExpirationTime() < CDateTime::Now()) {
     44        if (cert.GetExpirationTime().empty()) {
     45                if (cert.GetExpirationTime() < fz::datetime::now()) {
    4646                        pDlg->SetChildLabel(XRCID("ID_EXPIRATION_TIME"), wxString::Format(_("%s - Certificate expired!"), CTimeFormat::Format(cert.GetExpirationTime())));
    4747                        xrc_call(*pDlg, "ID_EXPIRATION_TIME", &wxWindow::SetForegroundColour, wxColour(255, 0, 0));
     
    9393                min.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
    9494        }
     95
     96        // Add extra safety margin to prevent squishing on OS X.
     97        min.x += 2;
     98
    9599        subjectPanel->SetMinSize(min);
    96100        subjectPanel->Thaw();
     
    529533        auto xCert = certs.append_child("Certificate");
    530534        AddTextElement(xCert, "Data", ConvertHexToString(data, len));
    531         AddTextElement(xCert, "ActivationTime", static_cast<int64_t>(certificate.GetActivationTime().GetTimeT()));
    532         AddTextElement(xCert, "ExpirationTime", static_cast<int64_t>(certificate.GetExpirationTime().GetTimeT()));
     535        AddTextElement(xCert, "ActivationTime", static_cast<int64_t>(certificate.GetActivationTime().get_time_t()));
     536        AddTextElement(xCert, "ExpirationTime", static_cast<int64_t>(certificate.GetExpirationTime().get_time_t()));
    533537        AddTextElement(xCert, "Host", notification.GetHost());
    534538        AddTextElement(xCert, "Port", notification.GetPort());
Note: See TracChangeset for help on using the changeset viewer.