mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-20 04:41:36 +02:00
Code Issues Releases Wiki Activity

* Remove gloox support. XmppBot will need to be ported but was broken by now, anyway.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-05-25 05:52:08 +02:00
parent 677944d403
commit 3b5f48926c
4 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeModules/FindGloox.cmake
View File

@@ -1,23 +0,0 @@
# - Try to find GLOOX
# Find GLOOX headers, libraries and the answer to all questions.
#
# GLOOX_FOUND True if gloox got found
# GLOOX_INCLUDE_DIR Location of gloox headers
# GLOOX_LIBRARIES List of libaries to use gloox
#
# Copyright (c) 2009 Nigmatullin Ruslan <euroelessar@gmail.com>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
FIND_PATH( GLOOX_INCLUDE_DIR "gloox/gloox.h" )
FIND_LIBRARY( GLOOX_LIBRARIES gloox )
if( GLOOX_LIBRARIES AND GLOOX_INCLUDE_DIR )
message( STATUS "Found gloox: ${GLOOX_LIBRARIES}" )
set( GLOOX_FOUND 1 )
else( GLOOX_LIBRARIES AND GLOOX_INCLUDE_DIR )
message( STATUS "Could NOT find gloox" )
endif( GLOOX_LIBRARIES AND GLOOX_INCLUDE_DIR )

8
src/CMakeLists.txt
View File

@@ -154,11 +154,6 @@ IF( APPLE )
SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp ) SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp )
ENDIF( APPLE ) ENDIF( APPLE )
IF(GLOOX_FOUND)
INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} )
SET( tomahawkSources ${tomahawkSources} xmppbot/XmppBot.cpp )
ENDIF(GLOOX_FOUND)
ADD_SUBDIRECTORY( accounts ) ADD_SUBDIRECTORY( accounts )
ADD_SUBDIRECTORY( infoplugins ) ADD_SUBDIRECTORY( infoplugins )
@@ -207,9 +202,6 @@ SET(LINK_LIBRARIES "")
IF(LIBLASTFM_FOUND) IF(LIBLASTFM_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 ) SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
ENDIF(LIBLASTFM_FOUND) ENDIF(LIBLASTFM_FOUND)
IF(GLOOX_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${GLOOX_LIBRARIES} )
ENDIF(GLOOX_FOUND)
IF(QCA2_FOUND) IF(QCA2_FOUND)
SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} ) SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
ENDIF(QCA2_FOUND) ENDIF(QCA2_FOUND)

1
src/Config.h.in
View File

@@ -21,7 +21,6 @@
#cmakedefine WITH_CRASHREPORTER #cmakedefine WITH_CRASHREPORTER
#cmakedefine LIBLASTFM_FOUND #cmakedefine LIBLASTFM_FOUND
#cmakedefine GLOOX_FOUND
#cmakedefine QCA2_FOUND #cmakedefine QCA2_FOUND
#endif // CONFIG_H_IN #endif // CONFIG_H_IN

9
src/TomahawkApp.cpp
View File

@@ -83,11 +83,6 @@
#include <TomahawkSettingsGui.h> #include <TomahawkSettingsGui.h>
#endif #endif
// should go to a plugin actually
#ifdef GLOOX_FOUND
#include "xmppbot/XmppBot.h"
#endif
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
#include "mac/MacShortcutHandler.h" #include "mac/MacShortcutHandler.h"
@@ -593,10 +588,6 @@ TomahawkApp::initSIP()
//FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings
if ( !arguments().contains( "--nosip" ) ) if ( !arguments().contains( "--nosip" ) )
{ {
#ifdef GLOOX_FOUND
m_xmppBot = QWeakPointer<XMPPBot>( new XMPPBot( this ) );
#endif
tDebug( LOGINFO ) << "Connecting SIP classes"; tDebug( LOGINFO ) << "Connecting SIP classes";
Accounts::AccountManager::instance()->initSIP(); Accounts::AccountManager::instance()->initSIP();
} }