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 /include/tubes | |
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 'include/tubes')
-rw-r--r-- | include/tubes/collaboration.hxx | 55 | ||||
-rw-r--r-- | include/tubes/manager.hxx | 159 | ||||
-rw-r--r-- | include/tubes/tubesdllapi.h | 15 |
3 files changed, 0 insertions, 229 deletions
diff --git a/include/tubes/collaboration.hxx b/include/tubes/collaboration.hxx deleted file mode 100644 index d07bc168e4da..000000000000 --- a/include/tubes/collaboration.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_TUBES_COLLABORATION_HXX -#define INCLUDED_TUBES_COLLABORATION_HXX - -#include <sal/config.h> - -#include <rtl/ustring.hxx> -#include <tubes/tubesdllapi.h> -#include <vcl/vclptr.hxx> - -class TeleConference; -namespace tubes { class TubeContacts; } -typedef struct _TpContact TpContact; - -class TUBES_DLLPUBLIC Collaboration -{ - TeleConference* mpConference; - VclPtr<tubes::TubeContacts> mpContacts; - - Collaboration(Collaboration &) = delete; - void operator =(Collaboration &) = delete; - -public: - Collaboration(); - virtual ~Collaboration(); - - /** Returns to normal editing mode */ - virtual void EndCollaboration() const = 0; - virtual void PacketReceived( const OString& rPacket ) const = 0; - /** Saves current document and then calls SendFile() with the file URL */ - virtual void SaveAndSendFile( TpContact* pContact ) const = 0; - /** Prepares document for collaboration and should call SetConference() */ - virtual void StartCollaboration( TeleConference* pConference ) = 0; - - SAL_DLLPRIVATE sal_uInt64 GetId() const; - SAL_DLLPRIVATE void Invite( TpContact* pContact ) const; - - /** Application calls this to display contacts dialog from where can the collaboration start */ - void DisplayContacts(); - void SendFile( TpContact* pContact, const OUString& rURL ) const; - void SendPacket( const OString& rPacket ) const; - void SetConference( TeleConference* pConference ); -}; - -#endif // INCLUDED_TUBES_COLLABORATION_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tubes/manager.hxx b/include/tubes/manager.hxx deleted file mode 100644 index badc9275d0fc..000000000000 --- a/include/tubes/manager.hxx +++ /dev/null @@ -1,159 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_TUBES_MANAGER_HXX -#define INCLUDED_TUBES_MANAGER_HXX - -#include <sal/config.h> -#include <tubes/tubesdllapi.h> -#include <rtl/ustring.hxx> - -#include <utility> -#include <vector> -#include <memory> - -// For testing purposes, we might need more in future. -#define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc" -#define LIBO_TUBES_DBUS_MSG_METHOD "LibOMsg" -#define LIBO_TUBES_DBUS_PATH "/org/libreoffice/calc" - -namespace osl { class Mutex; } -class Collaboration; -class TeleConference; -class TeleManagerImpl; -typedef struct _TpAccount TpAccount; -typedef struct _TpContact TpContact; - -typedef ::std::pair< TpAccount *, TpContact * > AccountContactPair; -typedef ::std::vector< AccountContactPair > AccountContactPairV; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -/** Interface to Telepathy DBus Tubes. - - Fragile, not working yet. - - Accounts need to have been setup within Empathy already. - */ - -class TeleManager -{ -public: - /** Prepare tube manager with account and service to be offered/listened - to. - */ - TUBES_DLLPUBLIC static bool init( bool bListen ); - - TUBES_DLLPUBLIC static void finalize(); - - /** True if there has been tube channel received and is still not used. */ - TUBES_DLLPUBLIC static bool hasWaitingConference(); - - /** Get a conference with current UUID to set a session. */ - TUBES_DLLPUBLIC static TeleConference* getConference(); - - /** Connect to DBus, create and prepare the Telepathy Account Manager. */ - static bool createAccountManager(); - - /** Setup client handlers. */ - static bool registerClients(); - - /** Fetches the contact list. - Is non-functional until createAccountManager(). - */ - // exported for unit test - TUBES_DLLPUBLIC static AccountContactPairV getContacts(); - - /** Start a demo session where all local documents are shared to each other */ - static TeleConference* startDemoSession(); - - /** Start a group session in a MUC. - - @param pAccount - The account to use. This must be a valid Jabber account. - - @param rConferenceRoom - The MUC to be created/joined, e.g. "LibreOffice". If empty, the - conference's UUID is used. - - @param rConferenceServer - Server to create the MUC on, e.g. "conference.example.org". If - empty, only the conference's UUID is used and rConferenceRoom is - ignored, hopefully resulting in a local DBus tube. - */ - static TeleConference* startGroupSession( TpAccount *pAccount, - const OUString& rConferenceRoom, - const OUString& rConferenceServer ); - - /** Start a session with a buddy. - - @param pAccount - The account to use. This must be a valid Jabber account. - - @param pBuddy - The buddy to be connected. Must be a contact of pAccount. - */ - // exported for unit test - TUBES_DLLPUBLIC static TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy ); - - static void registerCollaboration( Collaboration* pCollaboration ); - static void unregisterCollaboration( Collaboration* pCollaboration ); - /** Used to determine whether we are closing the channel by ourselves. - * @return true if the Collaboration is still registered */ - static bool existsCollaboration( Collaboration* pCollaboration ); - /** Display contact list dialog for all documents. */ - static void displayAllContacts(); - - static void registerDemoConference( TeleConference* pConference ); - static void unregisterDemoConference( TeleConference* pConference ); - /** Broadcast packet to all conferences. Used for demo mode. */ - static void broadcastPacket( const OString& rPacket ); - - - // Only for callbacks. - static void addConference( TeleConference* pConference ); - static OString createUuid(); - /** @param rUuid - is stored so that accepted conference with this UUID could be - then retrieved by getConference() when loading new document - */ - static void setCurrentUuid( const OString& rUuid ); - - /// "LibreOfficeWhatEver" - static OString getFullClientName(); - - /// "org.libreoffice.calcWhatEver" - static OString getFullServiceName(); - - /// "/org/libreoffice/calcWhatEver" - static OString getFullObjectPath(); - - /** Add a suffix to the client name and DBus tube names, e.g. "WhatEver" - - Normally the client name is LibreOffice and the DBus tube service name - is something like org.libreoffice.calc, this modifies the names to - "LibreOffice"+pName and "org.libreoffice.calc"+pName to make tests not - interfere with the real world. This is not to be used otherwise. If - used it must be called before the first TeleManager is instantiated and - connects. - */ - // exported for unit test - TUBES_DLLPUBLIC static void addSuffixToNames( const char* pName ); - -private: - static std::unique_ptr<TeleManagerImpl> pImpl; - - static ::osl::Mutex& GetMutex(); -}; - -// FIXME: should be static and not used in conference.cxx -void TeleManager_fileReceived( const OUString& rStr, const OString& rUuid ); - -#endif // INCLUDED_TUBES_MANAGER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tubes/tubesdllapi.h b/include/tubes/tubesdllapi.h deleted file mode 100644 index 1e9312740d78..000000000000 --- a/include/tubes/tubesdllapi.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef INCLUDED_TUBES_TUBESDLLAPI_H -#define INCLUDED_TUBES_TUBESDLLAPI_H - -#include "sal/types.h" - -#if defined(TUBES_DLLIMPLEMENTATION) -#define TUBES_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define TUBES_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif - -#endif // INCLUDED_TUBES_TUBESDLLAPI_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |