Commit 92757db1 authored by Karel Slaný's avatar Karel Slaný
Browse files

Modification related to recent rebase.

parent fb0af8c6
......@@ -328,7 +328,8 @@ int Messages::getAllDbSize(void)
QStringList userNameList(AccountListModel::globAccounts.keys());
foreach (const QString &userName, userNameList) {
MessageDb *msgDb = globMessageDbsPtr->accessMessageDb(
globSet.dbsLocation, userName);
globSet.dbsLocation, userName,
AccountListModel::globAccounts[userName].storeToDisk());
if (msgDb == NULL) {
qDebug("ERROR: Cannot open message database for user name '%s'.", userName.toUtf8().constData());
return -1;
......@@ -336,7 +337,8 @@ int Messages::getAllDbSize(void)
size += msgDb->getDbSizeInBytes();
FileDb *fDb = globFileDbsPtr->accessFileDb(globSet.dbsLocation,
userName);
userName,
AccountListModel::globAccounts[userName].storeToDisk());
if (fDb == NULL) {
qDebug("ERROR: Cannot open file database for user name '%s'.", userName.toUtf8().constData());
return -1;
......@@ -376,7 +378,8 @@ bool Messages::relocateDatabases(const QString &newLocation,
}
MessageDb *mDb = globMessageDbsPtr->accessMessageDb(
globSet.dbsLocation, userName);
globSet.dbsLocation, userName,
AccountListModel::globAccounts[userName].storeToDisk());
relocationSucceeded = (mDb != NULL);
if (!relocationSucceeded) {
qWarning("Cannot access message database for user name '%s'.",
......@@ -384,7 +387,8 @@ bool Messages::relocateDatabases(const QString &newLocation,
break; /* Break the for cycle. */
}
FileDb *fDb = globFileDbsPtr->accessFileDb(
globSet.dbsLocation, userName);
globSet.dbsLocation, userName,
AccountListModel::globAccounts[userName].storeToDisk());
relocationSucceeded = (fDb != NULL);
if (!relocationSucceeded) {
qWarning("Cannot access file database for user name '%s'.",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment