diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-04-14 02:44:20 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-04-14 03:32:37 +0200 |
| commit | b7b159d79c2b4ec53915e0b9c3e28912c289a5ba (patch) | |
| tree | 2510d25832202cfbc79378473b497540dd5a5500 /desktop | |
| parent | 6f12914ddfb4d69c0267b206be654c875da17426 (diff) | |
remove the old collaboration feature based on telepathy
Change-Id: I1f08d6ef43b76e7bae41ac33bb954f506ae7c485
Reviewed-on: https://gerrit.libreoffice.org/36542
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CppunitTest_desktop_app.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 4 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 14 |
3 files changed, 0 insertions, 19 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index b809b6a7e8c6..e7d48e04e1a4 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -40,7 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ svt \ tk \ tl \ - $(if $(ENABLE_TELEPATHY),tubes) \ ucbhelper \ utl \ vcl \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 1d91403a83bb..29185e08f707 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -158,8 +158,4 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ endif endif -ifeq ($(ENABLE_TELEPATHY),TRUE) -$(eval $(call gb_Library_use_libraries,sofficeapp,tubes)) -endif - # vim: set ts=4 sw=4 et: diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 13e2b6e7564d..10c3d916f886 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -116,12 +116,6 @@ #include "langselect.hxx" -#include <config_telepathy.h> - -#if ENABLE_TELEPATHY -#include <tubes/manager.hxx> -#endif - #if HAVE_FEATURE_BREAKPAD #include <fstream> #endif @@ -534,9 +528,6 @@ Desktop::Desktop() Desktop::~Desktop() { -#if ENABLE_TELEPATHY - TeleManager::finalize(); -#endif } void Desktop::Init() @@ -1613,11 +1604,6 @@ int Desktop::Main() aOptions.SetVCLSettings(); SetSplashScreenProgress(60); -#if ENABLE_TELEPATHY - bool bListen = rCmdLineArgs.IsInvisible(); - TeleManager::init( bListen ); -#endif - if ( !pExecGlobals->bRestartRequested ) { Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) ); |