projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We now send WHO every 60 seconds for all channels we are in. This keeps the nicklist,
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
5ebc4c6
..
03d22d4
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-141,7
+141,7
@@
QString Core::setupCore(const QVariant &setupData_) {
return tr("Could not setup storage!");
}
CoreSettings s;
return tr("Could not setup storage!");
}
CoreSettings s;
-
//s.setStorageSettings(msg
);
+
s.setStorageSettings(setupData
);
qDebug() << qPrintable(tr("Creating admin user..."));
mutex.lock();
storage->addUser(user, password);
qDebug() << qPrintable(tr("Creating admin user..."));
mutex.lock();
storage->addUser(user, password);
@@
-275,6
+275,11
@@
bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
return instance()->storage->removeBuffer(user, bufferId);
}
return instance()->storage->removeBuffer(user, bufferId);
}
+BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
+ QMutexLocker locker(&mutex);
+ return instance()->storage->renameBuffer(user, networkId, newName, oldName);
+}
+
void Core::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
QMutexLocker locker(&mutex);
return instance()->storage->setBufferLastSeen(user, bufferId, seenDate);
void Core::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
QMutexLocker locker(&mutex);
return instance()->storage->setBufferLastSeen(user, bufferId, seenDate);