start refactoring and testing non-SASL auth

1 files changed, 10 insertions, 9 deletions

diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index 4e655885..d4625ba3 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -224,15 +224,6 @@ void QXmppStream::socketReadReady()
     parser(data);
 }
 
-void QXmppStream::sendNonSASLAuthQuery( const QString &to )
-{
-    QXmppNonSASLAuthTypesRequestIq authQuery;
-    authQuery.setTo(to);
-    authQuery.setUsername(configuration().user());
-
-    sendPacket(authQuery);
-}
-
 /// Returns the QXmppLogger associated with the current QXmppStream.
 
 QXmppLogger *QXmppStream::logger()
@@ -821,6 +812,7 @@ bool QXmppStream::sendToServer(const QByteArray& packet)
 void QXmppStream::sendNonSASLAuth(bool plainText)
 {
     QXmppNonSASLAuthIq authQuery;
+    authQuery.setType(QXmppIq::Set);
     authQuery.setUsername(configuration().user());
     authQuery.setPassword(configuration().passwd());
     authQuery.setResource(configuration().resource());
@@ -830,6 +822,15 @@ void QXmppStream::sendNonSASLAuth(bool plainText)
     sendPacket(authQuery);
 }
 
+void QXmppStream::sendNonSASLAuthQuery( const QString &to )
+{
+    QXmppNonSASLAuthIq authQuery;
+    authQuery.setType(QXmppIq::Get);
+    authQuery.setTo(to);
+    authQuery.setUsername(configuration().user());
+    sendPacket(authQuery);
+}
+
 // challenge is BASE64 encoded string
 void QXmppStream::sendAuthDigestMD5ResponseStep1(const QString& challenge)
 {