projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reenable CoreConfigWizard
[quassel.git]
/
src
/
client
/
coreconnection.cpp
diff --git
a/src/client/coreconnection.cpp
b/src/client/coreconnection.cpp
index
3d769cc
..
3a6b784
100644
(file)
--- a/
src/client/coreconnection.cpp
+++ b/
src/client/coreconnection.cpp
@@
-200,9
+200,9
@@
void CoreConnection::coreHasData() {
disconnectFromCore();
return;
} else if(msg["MsgType"] == "CoreSetupAck") {
disconnectFromCore();
return;
} else if(msg["MsgType"] == "CoreSetupAck") {
-
//
emit coreSetupSuccess();
+ emit coreSetupSuccess();
} else if(msg["MsgType"] == "CoreSetupReject") {
} else if(msg["MsgType"] == "CoreSetupReject") {
-
//
emit coreSetupFailed(msg["Error"].toString());
+ emit coreSetupFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginReject") {
loginFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginAck") {
} else if(msg["MsgType"] == "ClientLoginReject") {
loginFailed(msg["Error"].toString());
} else if(msg["MsgType"] == "ClientLoginAck") {
@@
-459,6
+459,13
@@
void CoreConnection::connectionReady() {
_coreMsgBuffer.clear();
}
_coreMsgBuffer.clear();
}
+void CoreConnection::loginToCore(const QString &user, const QString &password, bool remember) {
+ _account.setUser(user);
+ _account.setPassword(password);
+ _account.setStorePassword(remember);
+ loginToCore();
+}
+
void CoreConnection::loginToCore(const QString &prevError) {
emit connectionMsg(tr("Logging in..."));
if(currentAccount().user().isEmpty() || currentAccount().password().isEmpty() || !prevError.isEmpty()) {
void CoreConnection::loginToCore(const QString &prevError) {
emit connectionMsg(tr("Logging in..."));
if(currentAccount().user().isEmpty() || currentAccount().password().isEmpty() || !prevError.isEmpty()) {
@@
-565,3
+572,10
@@
void CoreConnection::checkSyncState() {
emit synchronized();
}
}
emit synchronized();
}
}
+
+void CoreConnection::doCoreSetup(const QVariant &setupData) {
+ QVariantMap setup;
+ setup["MsgType"] = "CoreSetupData";
+ setup["SetupData"] = setupData;
+ SignalProxy::writeDataToDevice(_socket, setup);
+}