diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jreen/jabber.cpp index 1f418e8e7..2ad5ec7a7 100644 --- a/src/sip/jreen/jabber.cpp +++ b/src/sip/jreen/jabber.cpp @@ -363,8 +363,7 @@ JabberPlugin::sendMsg(const QString& to, const QString& msg) sipMessage = new TomahawkSipMessage(m["ip"].toString(), m["port"].toInt(), m["uniqname"].toString(), - m["key"].toString(), - m["visible"].toBool() + m["key"].toString() ); } else diff --git a/src/sip/jreen/tomahawksipmessage.cpp b/src/sip/jreen/tomahawksipmessage.cpp index 0dce37b0b..b0f1a7947 100644 --- a/src/sip/jreen/tomahawksipmessage.cpp +++ b/src/sip/jreen/tomahawksipmessage.cpp @@ -26,14 +26,14 @@ public: bool visible; }; -TomahawkSipMessage::TomahawkSipMessage(QString ip, unsigned int port, QString uniqname, QString key, bool visible) : d_ptr(new TomahawkSipMessagePrivate) +TomahawkSipMessage::TomahawkSipMessage(QString ip, unsigned int port, QString uniqname, QString key) : d_ptr(new TomahawkSipMessagePrivate) { Q_D(TomahawkSipMessage); d->ip = ip; d->port = port; d->uniqname = uniqname; d->key = key; - d->visible = visible; + d->visible = true; } TomahawkSipMessage::TomahawkSipMessage() : d_ptr(new TomahawkSipMessagePrivate) diff --git a/src/sip/jreen/tomahawksipmessage.h b/src/sip/jreen/tomahawksipmessage.h index da1c376c5..120ce5ea1 100644 --- a/src/sip/jreen/tomahawksipmessage.h +++ b/src/sip/jreen/tomahawksipmessage.h @@ -11,7 +11,9 @@ class TomahawkSipMessage : public Jreen::StanzaExtension J_EXTENSION(TomahawkSipMessage, "") Q_DECLARE_PRIVATE(TomahawkSipMessage) public: - TomahawkSipMessage(QString ip, unsigned int port, QString uniqname, QString key, bool visible); + // sets visible to true + TomahawkSipMessage(QString ip, unsigned int port, QString uniqname, QString key); + // sets visible to false as we dont have any extra information TomahawkSipMessage(); ~TomahawkSipMessage(); diff --git a/src/sip/jreen/tomahawksipmessagefactory.cpp b/src/sip/jreen/tomahawksipmessagefactory.cpp index 20a0a9ba8..fbf2d7920 100644 --- a/src/sip/jreen/tomahawksipmessagefactory.cpp +++ b/src/sip/jreen/tomahawksipmessagefactory.cpp @@ -120,5 +120,8 @@ void TomahawkSipMessageFactory::serialize(StanzaExtension *extension, QXmlStream StanzaExtension::Ptr TomahawkSipMessageFactory::createExtension() { - return StanzaExtension::Ptr(new TomahawkSipMessage(m_ip, m_port, m_uniqname, m_key, m_visible)); + if(m_visible) + return StanzaExtension::Ptr(new TomahawkSipMessage(m_ip, m_port, m_uniqname, m_key)); + else + return StanzaExtension::Ptr(new TomahawkSipMessage()); }