summaryrefslogtreecommitdiffstats
path: root/pica-client/nodethread.cpp
diff options
context:
space:
mode:
authorAnton <anton@picapica>2015-03-13 03:45:11 +0400
committerAnton <anton@picapica>2015-03-13 03:45:11 +0400
commita3b23291f5c50b423faa4d3c3ae88889be02d6cb (patch)
treef4ba6e7a6cfbeafd3ccd5cb2efb8a4a4f0a5cb2b /pica-client/nodethread.cpp
parent94587f893a83cf505d655169b6b45b24345a8aa9 (diff)
downloadpica-pica-a3b23291f5c50b423faa4d3c3ae88889be02d6cb.tar.gz
pica-pica-a3b23291f5c50b423faa4d3c3ae88889be02d6cb.zip
updated client library calls in pica-client and fixed password asking dialog behaviour, now invalid password error is detected and asked again, cancel button is handled
Diffstat (limited to 'pica-client/nodethread.cpp')
-rw-r--r--pica-client/nodethread.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp
index 3850397..579b84b 100644
--- a/pica-client/nodethread.cpp
+++ b/pica-client/nodethread.cpp
@@ -6,7 +6,7 @@
QMutex NodeThread::finished_mutex;
-NodeThread::NodeThread(Nodes::NodeRecord &addr, bool *completed, Accounts::AccountRecord &acc, PICA_c2n **pica_conn, QMutex *wm) :
+NodeThread::NodeThread(Nodes::NodeRecord &addr, bool *completed, PICA_acc *acc, PICA_c2n **pica_conn, QMutex *wm) :
QThread(0)
{
node_addr = addr;
@@ -23,14 +23,15 @@ void NodeThread::run()
int ret;
exit = 0;
- ret = PICA_new_connection(node_addr.address.toUtf8().constData(),
+ /*ret = PICA_new_connection(node_addr.address.toUtf8().constData(),
node_addr.port,
user_account.CA_file.toUtf8().constData(),
user_account.cert_file.toUtf8().constData(),
user_account.pkey_file.toUtf8().constData(),
DHParam::GetDHParamFilename().toUtf8().constData(),
AskPassword::ask_password_cb,
- &ci);
+ &ci);*/
+ ret = PICA_new_connection(user_account, node_addr.address.toUtf8().constData(), node_addr.port, &ci);
switch(ret)
{