projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #167 from esainane/patch-1
[quassel.git]
/
src
/
core
/
sqlitestorage.cpp
diff --git
a/src/core/sqlitestorage.cpp
b/src/core/sqlitestorage.cpp
index
46e2c70
..
e71c537
100644
(file)
--- a/
src/core/sqlitestorage.cpp
+++ b/
src/core/sqlitestorage.cpp
@@
-968,7
+968,7
@@
void SqliteStorage::setChannelPersistent(UserId user, const NetworkId &networkId
QSqlQuery query(db);
query.prepare(queryString("update_buffer_persistent_channel"));
query.bindValue(":userid", user.toInt());
QSqlQuery query(db);
query.prepare(queryString("update_buffer_persistent_channel"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":network
I
d", networkId.toInt());
+ query.bindValue(":network
i
d", networkId.toInt());
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":joined", isJoined ? 1 : 0);
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":joined", isJoined ? 1 : 0);
@@
-990,7
+990,7
@@
void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId &networ
QSqlQuery query(db);
query.prepare(queryString("update_buffer_set_channel_key"));
query.bindValue(":userid", user.toInt());
QSqlQuery query(db);
query.prepare(queryString("update_buffer_set_channel_key"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":network
I
d", networkId.toInt());
+ query.bindValue(":network
i
d", networkId.toInt());
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":key", key);
query.bindValue(":buffercname", channel.toLower());
query.bindValue(":key", key);
@@
-1808,6
+1808,7
@@
bool SqliteMigrationReader::readMo(QuasselUserMO &user)
user.id = value(0).toInt();
user.username = value(1).toString();
user.password = value(2).toString();
user.id = value(0).toInt();
user.username = value(1).toString();
user.password = value(2).toString();
+ user.hashversion = value(3).toInt();
return true;
}
return true;
}