summaryrefslogtreecommitdiffstats
path: root/pica-client/skynet.cpp
diff options
context:
space:
mode:
authorme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2013-09-01 12:34:15 +0000
committerme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2013-09-01 12:34:15 +0000
commitfe7749bee62380dac4d5dea00b2f5b20db344cbb (patch)
treee46ee11712b0444eee5874328567c050f6498d0b /pica-client/skynet.cpp
parentd970ad6a4ac7e077390d8fdac0a4fc576b24dc5c (diff)
downloadpica-pica-fe7749bee62380dac4d5dea00b2f5b20db344cbb.tar.gz
pica-pica-fe7749bee62380dac4d5dea00b2f5b20db344cbb.zip
global variable account_id is replaced with static members Accounts::AccountRecord & Accounts::GetCurrentAccount() and SetCurrentAccount()
git-svn-id: svn://localhost/project_picapica/trunk@268 fb96df88-216d-11de-830c-f3023f12d8ac
Diffstat (limited to 'pica-client/skynet.cpp')
-rw-r--r--pica-client/skynet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/pica-client/skynet.cpp b/pica-client/skynet.cpp
index 111b79a..974c1a8 100644
--- a/pica-client/skynet.cpp
+++ b/pica-client/skynet.cpp
@@ -65,7 +65,7 @@ void SkyNet::nodethread_connected(QString addr, quint16 port, NodeThread *thread
//load undelivered messages from history
if (msgqueues.isEmpty())
{
- History h(config_dbname, QByteArray((const char*)account_id, PICA_ID_SIZE));
+ History h(config_dbname, Accounts::GetCurrentAccount().id);
msgqueues = h.GetUndeliveredMessages();
}
@@ -100,7 +100,7 @@ void SkyNet::verify_peer_cert(QByteArray peer_id, QString cert_pem, bool *verifi
// ViewCertDialog vcd;
// vcd.SetCert(cert_pem);
// vcd.exec();
- Contacts cnt(config_dbname, QByteArray((const char*)account_id, PICA_ID_SIZE));
+ Contacts cnt(config_dbname, Accounts::GetCurrentAccount().id);
QString stored_cert;
if ((stored_cert = cnt.GetContactCert(peer_id)).isEmpty())