X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fsqlitestorage.cpp;h=aa252e7701673878d256ae12fca984cfb153a6ee;hb=719ef475f4a859a5e2c1357cb40cd6e89dfc8433;hp=1d732d31760568dc36964c90e391d42c033fe82b;hpb=18cda6df43b5960686256fb6a899a63baebff70d;p=quassel.git

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 1d732d31..aa252e77 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");
 }
 
@@ -591,6 +594,9 @@ void SqliteStorage::bindNetworkInfo(QSqlQuery &query, const NetworkInfo &info) {
   query.bindValue(":useautoidentify", info.useAutoIdentify ? 1 : 0);
   query.bindValue(":autoidentifyservice", info.autoIdentifyService);
   query.bindValue(":autoidentifypassword", info.autoIdentifyPassword);
+  query.bindValue(":usesasl", info.useSasl ? 1 : 0);
+  query.bindValue(":saslaccount", info.saslAccount);
+  query.bindValue(":saslpassword", info.saslPassword);
   query.bindValue(":useautoreconnect", info.useAutoReconnect ? 1 : 0);
   query.bindValue(":autoreconnectinterval", info.autoReconnectInterval);
   query.bindValue(":autoreconnectretries", info.autoReconnectRetries);
@@ -780,6 +786,9 @@ QList<NetworkInfo> SqliteStorage::networks(UserId user) {
         net.autoReconnectRetries = networksQuery.value(13).toInt();
         net.unlimitedReconnectRetries = networksQuery.value(14).toInt() == 1 ? true : false;
         net.rejoinChannels = networksQuery.value(15).toInt() == 1 ? true : false;
+        net.useSasl = networksQuery.value(16).toInt() == 1 ? true : false;
+        net.saslAccount = networksQuery.value(17).toString();
+        net.saslPassword = networksQuery.value(18).toString();
 
         serversQuery.bindValue(":networkid", net.networkId.toInt());
         safeExec(serversQuery);
@@ -1037,6 +1046,7 @@ BufferInfo SqliteStorage::bufferInfo(UserId user, const NetworkId &networkId, Bu
       createQuery.bindValue(":buffertype", (int)type);
       createQuery.bindValue(":buffername", buffer);
       createQuery.bindValue(":buffercname", buffer.toLower());
+      createQuery.bindValue(":joined", type & BufferInfo::ChannelBuffer ? 1 : 0);
 
       unlock();
       lockForWrite();
@@ -1729,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;
 }