X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=34a25cb5b23a568469c68f8cf0478f77c3160bf6;hb=12db1c296a1964d60de7e438306ddedbf809a1bf;hp=77de257751375a66c5c845cc7eb8f07a479e234a;hpb=b1c606a9d153c5b501476551af3386b993f5635a;p=quassel.git

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 77de2577..34a25cb5 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -168,9 +168,9 @@ QString Core::setupCore(QVariantMap setupData) {
   CoreSettings s;
   s.setStorageSettings(setupData);
   quInfo() << qPrintable(tr("Creating admin user..."));
-  mutex.lock();
+  //mutex.lock();
   storage->addUser(user, password);
-  mutex.unlock();
+  //mutex.unlock();
   startListening();  // TODO check when we need this
   return QString();
 }
@@ -225,23 +225,23 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) {
 }
 
 void Core::syncStorage() {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   if(storage) storage->sync();
 }
 
 /*** Storage Access ***/
 void Core::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   instance()->storage->setUserSetting(userId, settingName, data);
 }
 
 QVariant Core::getUserSetting(UserId userId, const QString &settingName, const QVariant &data) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->getUserSetting(userId, settingName, data);
 }
 
 bool Core::createNetwork(UserId user, NetworkInfo &info) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   NetworkId networkId = instance()->storage->createNetwork(user, info);
   if(!networkId.isValid())
     return false;
@@ -251,107 +251,107 @@ bool Core::createNetwork(UserId user, NetworkInfo &info) {
 }
 
 bool Core::updateNetwork(UserId user, const NetworkInfo &info) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->updateNetwork(user, info);
 }
 
 bool Core::removeNetwork(UserId user, const NetworkId &networkId) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->removeNetwork(user, networkId);
 }
 
 QList<NetworkInfo> Core::networks(UserId user) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->networks(user);
 }
 
 NetworkId Core::networkId(UserId user, const QString &network) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->getNetworkId(user, network);
 }
 
 QList<NetworkId> Core::connectedNetworks(UserId user) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->connectedNetworks(user);
 }
 
 void Core::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->setNetworkConnected(user, networkId, isConnected);
 }
 
 QHash<QString, QString> Core::persistentChannels(UserId user, const NetworkId &networkId) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->persistentChannels(user, networkId);
 }
 
 void Core::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->setChannelPersistent(user, networkId, channel, isJoined);
 }
 
 void Core::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->setPersistentChannelKey(user, networkId, channel, key);
 }
 
 BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->getBufferInfo(user, networkId, type, buffer);
 }
 
 BufferInfo Core::getBufferInfo(UserId user, const BufferId &bufferId) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->getBufferInfo(user, bufferId);
 }
 
 MsgId Core::storeMessage(const Message &message) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->logMessage(message);
 }
 
 QList<Message> Core::requestMsgs(UserId user, BufferId buffer, int lastmsgs, int offset) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->requestMsgs(user, buffer, lastmsgs, offset);
 }
 
 QList<Message> Core::requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->requestMsgs(user, buffer, since, offset);
 }
 
 QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, int last) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->requestMsgRange(user, buffer, first, last);
 }
 
 QList<BufferInfo> Core::requestBuffers(UserId user) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->requestBuffers(user);
 }
 
 QList<BufferId> Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->requestBufferIdsForNetwork(user, networkId);
 }
 
 bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->removeBuffer(user, bufferId);
 }
 
 BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->renameBuffer(user, networkId, newName, oldName);
 }
 
 void Core::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->setBufferLastSeenMsg(user, bufferId, msgId);
 }
 
 QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
-  QMutexLocker locker(&mutex);
+  // QMutexLocker locker(&mutex);
   return instance()->storage->bufferLastSeenMsgIds(user);
 }
 
@@ -366,12 +366,12 @@ bool Core::startListening() {
   uint port = Quassel::optionValue("port").toUInt();
 
   if(_server.listen(QHostAddress::Any, port)) {
-    quInfo() << "Listening for GUI clients on IPv6 port" << _server.serverPort()
+    quInfo() << "Listening for GUI clients on IPv4 port" << _server.serverPort()
              << "using protocol version" << Quassel::buildInfo().protocolVersion;
     success = true;
   }
   if(_v6server.listen(QHostAddress::AnyIPv6, port)) {
-    quInfo() << "Listening for GUI clients on IPv4 port" << _v6server.serverPort()
+    quInfo() << "Listening for GUI clients on IPv6 port" << _v6server.serverPort()
              << "using protocol version" << Quassel::buildInfo().protocolVersion;
     success = true;
   }
@@ -545,9 +545,9 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
       SignalProxy::writeDataToDevice(socket, reply);
     } else if(msg["MsgType"] == "ClientLogin") {
       QVariantMap reply;
-      mutex.lock();
+      // mutex.lock();
       UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString());
-      mutex.unlock();
+      // mutex.unlock();
       if(uid == 0) {
         reply["MsgType"] = "ClientLoginReject";
         reply["Error"] = tr("<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.");
@@ -627,9 +627,9 @@ void Core::setupInternalClientSession(SignalProxy *proxy) {
     setupCoreForInternalUsage();
   }
 
-  mutex.lock();
+  // mutex.lock();
   UserId uid = storage->internalUser();
-  mutex.unlock();
+  // mutex.unlock();
 
   // Find or create session for validated user
   SessionThread *sess;