mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-14 04:51:53 +02:00
Code Issues Releases Wiki Activity

Fix jreen build on windows

Browse Source
This commit is contained in:
Dominik Schmidt 2011-02-28 03:10:51 +01:00
parent e1cfcce489
commit 13cd815499
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -47,6 +47,9 @@ IF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
IF( UNIX AND NOT APPLE )
SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.so )
ENDIF( UNIX AND NOT APPLE )
IF( WIN32 )
SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.dll )
ENDIF( WIN32 )
SET( LIBJREEN_FOUND true )
MESSAGE(STATUS "Internal libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
ENDIF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )

7
src/sip/jabber/jabber_p.cpp
View File

@ -12,7 +12,7 @@
using namespace gloox;
using namespace std;
#define TOMAHAWK_CAP_NODE_NAME QLatin1String("http://tomahawk-player.org/")
#define TOMAHAWK_CAP_NODE_NAME QString::fromAscii("http://tomahawk-player.org/")
Jabber_p::Jabber_p( const QString& jid, const QString& password, const QString& server, const int port )
: QObject()
@ -42,6 +42,11 @@ Jabber_p::Jabber_p( const QString& jid, const QString& password, const QString&
qDebug() << "Our JID set to:" << m_jid.full().c_str();
m_client = QSharedPointer<gloox::Client>( new gloox::Client( m_jid, password.toStdString(), port ) );
const Capabilities *caps = m_client->presence().capabilities();
if( caps )
{
const_cast<Capabilities*>(caps)->setNode(TOMAHAWK_CAP_NODE_NAME.toStdString());
}
m_server = server;
}

1
src/sip/jreen/jabber.h
View File

@ -34,7 +34,6 @@ public slots:
void addContact( const QString &jid, const QString& msg = QString() );
private slots:
void onAuthError( int, const QString& );
void showAddFriendDialog();
private:

1
src/sip/jreen/jabber_p.h
View File

@ -60,7 +60,6 @@ public slots:
void onDisconnect(jreen::Client::DisconnectReason reason);
void onConnect();
void onDestroy();
private slots:
virtual void onNewPresence( const jreen::Presence& presence );