diff --git a/CMakeModules/FindGloox.cmake b/CMakeModules/FindGloox.cmake deleted file mode 100644 index ccdbdcfbf..000000000 --- a/CMakeModules/FindGloox.cmake +++ /dev/null @@ -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 -# -# 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 ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 78aefef0d..07e594c76 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -154,11 +154,6 @@ IF( APPLE ) SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp ) ENDIF( APPLE ) -IF(GLOOX_FOUND) - INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} ) - SET( tomahawkSources ${tomahawkSources} xmppbot/XmppBot.cpp ) -ENDIF(GLOOX_FOUND) - ADD_SUBDIRECTORY( accounts ) ADD_SUBDIRECTORY( infoplugins ) @@ -207,9 +202,6 @@ SET(LINK_LIBRARIES "") IF(LIBLASTFM_FOUND) SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 ) ENDIF(LIBLASTFM_FOUND) -IF(GLOOX_FOUND) - SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${GLOOX_LIBRARIES} ) -ENDIF(GLOOX_FOUND) IF(QCA2_FOUND) SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} ) ENDIF(QCA2_FOUND) diff --git a/src/Config.h.in b/src/Config.h.in index 87ec9b48d..c6172e0d9 100644 --- a/src/Config.h.in +++ b/src/Config.h.in @@ -21,7 +21,6 @@ #cmakedefine WITH_CRASHREPORTER #cmakedefine LIBLASTFM_FOUND -#cmakedefine GLOOX_FOUND #cmakedefine QCA2_FOUND #endif // CONFIG_H_IN diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index 21dd156ad..796b4392a 100644 --- a/src/TomahawkApp.cpp +++ b/src/TomahawkApp.cpp @@ -83,11 +83,6 @@ #include #endif -// should go to a plugin actually -#ifdef GLOOX_FOUND - #include "xmppbot/XmppBot.h" -#endif - #ifdef Q_WS_MAC #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 if ( !arguments().contains( "--nosip" ) ) { -#ifdef GLOOX_FOUND - m_xmppBot = QWeakPointer( new XMPPBot( this ) ); -#endif - tDebug( LOGINFO ) << "Connecting SIP classes"; Accounts::AccountManager::instance()->initSIP(); }