introduce a simpler connectToServer() function requiring only JID + password

3 files changed, 16 insertions, 1 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 62a7f03d..84749cc0 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -223,6 +223,19 @@ void QXmppClient::connectToServer(const QXmppConfiguration& config,
     d->stream->connectToHost();
 }
 
+/// Overloaded function to simply connect to an XMPP server.
+///
+/// \param jid JID for the account.
+/// \param password Password for the account.
+
+void QXmppClient::connectToServer(const QString &jid, const QString &passwd)
+{
+    d->stream->configuration().setUser(jidToUser(jid));
+    d->stream->configuration().setDomain(jidToDomain(jid));
+    d->stream->configuration().setPasswd(jidToDomain(passwd));
+    d->stream->connectToHost();
+}
+
 /// Overloaded function.
 /// \param host host name of the XMPP server where connection has to be made
 /// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index 8b684ff3..8f042797 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -111,6 +111,8 @@ public:
     void connectToServer(const QXmppConfiguration&,
                          const QXmppPresence& initialPresence = 
                          QXmppPresence());
+    void connectToServer(const QString &jid,
+                         const QString &passwd);
     void disconnectFromServer();
     bool isConnected() const;
 
diff --git a/src/src.pro b/src/src.pro
index 78edbc42..8f6c2139 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,7 +14,7 @@ CONFIG += staticlib
 # LIBS += -lspeex
 
 # DNS support
-macx {
+unix {
     LIBS += -lresolv
 }
 win32 {