Ticket #1466: filezilla_utf8_reconnect.patch

File filezilla_utf8_reconnect.patch, 2.3 KB (added by tommywu, 19 years ago)

force UTF8 won't reload while use reconnect

  • CommandQueue.cpp 

    diff -Nur source/CommandQueue.cpp source.patch/CommandQueue.cpp
    old new  
    6868    COptions::SetOption(OPTION_LASTSERVERPORT,server.port);
    6969    COptions::SetOption(OPTION_LASTSERVERUSER,server.user);
    7070    COptions::SetOption(OPTION_LASTSERVERDONTREMEMBERPASS,server.bDontRememberPass?1:0);
     71    COptions::SetOption(OPTION_LASTSERVERUTF8,server.nUTF8);
    7172    COptions::SetOption(OPTION_LASTSERVERNAME,server.name);
    7273    if (!server.bDontRememberPass && !_ttoi(COptions::GetOption(OPTION_RUNINSECUREMODE)))
    7374        COptions::SetOption(OPTION_LASTSERVERPASS,CCrypt::encrypt(server.pass));
    … …  
    777778        server2.host=COptions::GetOption(OPTION_LASTSERVERHOST);
    778779        server2.port=COptions::GetOptionVal(OPTION_LASTSERVERPORT);
    779780        server2.user=COptions::GetOption(OPTION_LASTSERVERUSER);
     781        server2.nUTF8=COptions::GetOptionVal(OPTION_LASTSERVERUTF8);
    780782        server2.bDontRememberPass=COptions::GetOptionVal(OPTION_LASTSERVERDONTREMEMBERPASS);
    781783        if (!server2.bDontRememberPass)
    782784        {

  • Options.cpp 

    diff -Nur source/Options.cpp source.patch/Options.cpp
    old new  
    507507                                    _T("Switch view locations"),        1,  _T("Use MODE Z "),                      1,
    508508                                    _T("MODE Z level"),                 1,  _T("Transfer IP v6"),                   0,
    509509                                    _T("Enable IPv6"),                  1,  _T("Log Timestamps"),                   1,
    510                                     _T("VMS display all revisions"),    1
     510                                    _T("VMS display all revisions"),    1,  _T("Last Server UTF8"),                 1
    511511                                };
    512512
    513513void COptions::SetOption(int nOptionID,int value)

  • Options.h 

    diff -Nur source/Options.h source.patch/Options.h
    old new  
    5252
    5353#include "misc\MarkupSTL.h"
    5454
    55 #define OPTIONS_NUM 115
     55#define OPTIONS_NUM 116
    5656
    5757/////////////////////////////////////////////////////////////////////////////
    5858// Dialogfeld COptions
    … …  
    280280#define OPTION_ENABLE_IPV6 113
    281281#define OPTION_LOGTIMESTAMPS 114
    282282#define OPTION_VMSALLREVISIONS 115
     283#define OPTION_LASTSERVERUTF8 116
    283284
    284285//{{AFX_INSERT_LOCATION}}
    285286// Microsoft Visual C++ fügt unmittelbar vor der vorhergehenden Zeile zusätzliche Deklarationen ein.