X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=34852e9c1077d01ba1e7a29ceb6105cf34ce4771;hp=c962e8f6de624d531f6d38d51fcb70298dd9ff97;hb=638ec016dc973ff1c573f3d8194d5eb6a165fdbd;hpb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index c962e8f6..34852e9c 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -42,6 +42,9 @@ bool SqliteStorage::isAvailable() const { } QString SqliteStorage::displayName() const { + // We identify the backend to use for the monolithic core by its displayname. + // so only change this string if you _really_ have to and make sure the core + // setup for the mono client still works ;) return QString("SQLite"); } @@ -1736,6 +1739,9 @@ bool SqliteMigrationReader::readMo(NetworkMO &network) { network.awaymessage = value(19).toString(); network.attachperform = value(20).toString(); network.detachperform = value(21).toString(); + network.usesasl = value(22).toInt() == 1 ? true : false; + network.saslaccount = value(23).toString(); + network.saslpassword = value(24).toString(); return true; } @@ -1752,8 +1758,8 @@ bool SqliteMigrationReader::readMo(BufferMO &buffer) { buffer.buffertype = value(6).toInt(); buffer.lastseenmsgid = value(7).toInt(); buffer.markerlinemsgid = value(8).toInt(); - buffer.key = value(8).toString(); - buffer.joined = value(9).toInt() == 1 ? true : false; + buffer.key = value(9).toString(); + buffer.joined = value(10).toInt() == 1 ? true : false; return true; }