← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

« back to all changes in this revision

Viewing changes to src/irc/server.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2009-05-19 09:44:08 UTC
  • mfrom: (1.16.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20090519094408-yi3yv1v4zzbsu2nx
Tags: 1.1.75+svn969816-1
* New upstream development snapshot:
  - Last Changed Author: tjmchenry
  - Last Changed Rev: 969816
  - Last Changed Date: 2009-05-19 04:45:54 +0300
  - Translations as of Tue, 19 May 2009 09:21:13 are included.
* Update download URL in debian/copyright.
* Update Debian menu icons.
* Update konversation.install: install translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/irc/server.cpp
103
103
    m_serverNickPrefixModes = "ovh";
104
104
    m_serverNickPrefixes = "@+%";
105
105
    m_channelPrefixes = "#&";
 
106
    m_modesCount = 3;
106
107
    m_showSSLConfirmation = true;
107
108
 
108
109
    setObjectName(QString::fromLatin1("server_") + settings.name());
447
448
    return m_channelPrefixes;
448
449
}
449
450
 
 
451
// set max number of channel modes with parameter according to 005 RPL_ISUPPORT
 
452
void Server::setModesCount(int count)
 
453
{
 
454
    m_modesCount = count;
 
455
}
 
456
 
 
457
int Server::getModesCount()
 
458
{
 
459
    return m_modesCount;
 
460
}
 
461
 
450
462
// set user mode prefixes according to non-standard 005-Reply (see inputfilter.cpp)
451
463
void Server::setPrefixes(const QString &modes, const QString& prefixes)
452
464
{
1025
1037
 
1026
1038
            m_inputBuffer << codec->toUnicode(first);
1027
1039
        }
 
1040
 
1028
1041
        bufferLines.removeFirst();
1029
 
        m_bytesReceived+=m_inputBuffer.back().length();
 
1042
 
 
1043
        // Qt uses 0xFDD0 and 0xFDD1 to mark the beginning and end of text frames. Remove
 
1044
        // these here to avoid fatal errors encountered in QText* and the event loop pro-
 
1045
        // cessing.
 
1046
        m_inputBuffer.back().remove(QChar(0xFDD0)).remove(QChar(0xFDD1));
 
1047
 
 
1048
        //FIXME: This has nothing to do with bytes, and it's not raw received bytes either. Bogus number.
 
1049
        //m_bytesReceived+=m_inputBuffer.back().length();
1030
1050
    }
1031
1051
 
1032
1052
    if( !m_incomingTimer.isActive() && !m_processingIncoming )