mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

sipjreen: hopefully fix a bug that could happen with visible:false peers

Browse Source
This commit is contained in:
Dominik Schmidt
2011-05-03 15:16:25 +02:00
parent 7330c9364d
commit 137c608fa2
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sip/jreen/jabber.cpp
View File

@@ -363,8 +363,7 @@ JabberPlugin::sendMsg(const QString& to, const QString& msg)
sipMessage = new TomahawkSipMessage(m["ip"].toString(), sipMessage = new TomahawkSipMessage(m["ip"].toString(),
m["port"].toInt(), m["port"].toInt(),
m["uniqname"].toString(), m["uniqname"].toString(),
m["key"].toString(), m["key"].toString()
m["visible"].toBool()
); );
} }
else else

4
src/sip/jreen/tomahawksipmessage.cpp
View File

@@ -26,14 +26,14 @@ public:
bool visible; 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); Q_D(TomahawkSipMessage);
d->ip = ip; d->ip = ip;
d->port = port; d->port = port;
d->uniqname = uniqname; d->uniqname = uniqname;
d->key = key; d->key = key;
d->visible = visible; d->visible = true;
} }
TomahawkSipMessage::TomahawkSipMessage() : d_ptr(new TomahawkSipMessagePrivate) TomahawkSipMessage::TomahawkSipMessage() : d_ptr(new TomahawkSipMessagePrivate)

4
src/sip/jreen/tomahawksipmessage.h
View File

@@ -11,7 +11,9 @@ class TomahawkSipMessage : public Jreen::StanzaExtension
J_EXTENSION(TomahawkSipMessage, "") J_EXTENSION(TomahawkSipMessage, "")
Q_DECLARE_PRIVATE(TomahawkSipMessage) Q_DECLARE_PRIVATE(TomahawkSipMessage)
public: 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 // sets visible to false as we dont have any extra information
TomahawkSipMessage(); TomahawkSipMessage();
~TomahawkSipMessage(); ~TomahawkSipMessage();

5
src/sip/jreen/tomahawksipmessagefactory.cpp
View File

@@ -120,5 +120,8 @@ void TomahawkSipMessageFactory::serialize(StanzaExtension *extension, QXmlStream
StanzaExtension::Ptr TomahawkSipMessageFactory::createExtension() 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());
} }