← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty

« back to all changes in this revision

Viewing changes to src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2013-05-18 19:36:33 UTC
  • mfrom: (24.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130518193633-d2caq4677ihxc93h
Tags: 4:4.2.0-2
Upload to unstable 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
2331
2331
 
2332
2332
        if(msg->connection()->stateData()->isInsideInitialCapLs())
2333
2333
        {
 
2334
                // CAP LS wasn't answered correctly.
2334
2335
                msg->connection()->handleFailedInitialCapLs();
2335
2336
                return;
2336
2337
        }
2337
 
        
2338
 
        // if not registered yet and a CAP LS request was sent out then
2339
 
        // hide it (WE have triggered the error).
 
2338
 
 
2339
#ifdef COMPILE_SSL_SUPPORT
 
2340
        if(msg->connection()->stateData()->isInsideInitialStartTls())
 
2341
        {
 
2342
                // The forced STARTTLS wasn't answered correctly.
 
2343
                msg->connection()->handleFailedInitialStartTls();
 
2344
                return;
 
2345
        }
 
2346
#endif //COMPILE_SSL_SUPPORT
 
2347
 
 
2348
        // If not registered yet and a CAP LS or STARTTLS request was sent out then
 
2349
        // hide it (as WE have triggered the error).
2340
2350
        if(msg->connection()->stateData()->ignoreOneYouHaveNotRegisteredError())
2341
2351
        {
2342
 
                // eat it once, silently.
 
2352
                // We DID send a CAP LS or a forced STARTTLS.
 
2353
                // The request was answered properly and this is probably the error related to the following PING.
 
2354
                // Eat it once, silently.
2343
2355
                msg->connection()->stateData()->setIgnoreOneYouHaveNotRegisteredError(false);
2344
2356
                return;
2345
2357
        }
2346
2358
 
2347
 
        // else we didn't send CAP LS so better show this to the user
 
2359
        // We didn't send CAP LS so better show this to the user
2348
2360
        if(!msg->haltOutput())
2349
2361
        {
2350
2362
                QString szCmd = msg->connection()->decodeText(msg->safeParam(0));