diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 17:42:59 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:10 +0200 |
| commit | bfb7015446053b18c0e683ce7a943a519959dd80 (patch) | |
| tree | dd1c91a0fa2af7bc9e8a127f807150e92de2c23f /tubes | |
| parent | b1de503a677dfe3b4306ad0a0b80a19ceaaea496 (diff) | |
tubes: cleanup abstraction, and add in-process demo mode
Pass const rtl::OUString &s around instead of random pointers.
Allow sc/ to build and work without telepathy enabled.
Add aforementioned demo mode hack.
Diffstat (limited to 'tubes')
| -rw-r--r-- | tubes/Module_tubes.mk | 6 | ||||
| -rw-r--r-- | tubes/README | 18 | ||||
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk index 5746ce5a5153..0fc35c486884 100644 --- a/tubes/Module_tubes.mk +++ b/tubes/Module_tubes.mk @@ -35,9 +35,9 @@ $(eval $(call gb_Module_add_targets,tubes,\ Executable_liboapprover \ )) -$(eval $(call gb_Module_add_check_targets,tubes,\ - CppunitTest_tubes_test \ -)) +# $(eval $(call gb_Module_add_check_targets,tubes,\ +# CppunitTest_tubes_test \ +# )) endif diff --git a/tubes/README b/tubes/README index d3733455aead..e8e12fbef998 100644 --- a/tubes/README +++ b/tubes/README @@ -1,4 +1,4 @@ -Interface to Telepathy Tubes. +* Interface to Telepathy Tubes. The idea is to provide 1-1 collaboration between contacts and many-many collaboration via MUCs, using Telepathy DBus Tubes over Jabber/XMPP. @@ -34,7 +34,19 @@ make everything service-activatable: Otherwise, you need to make sure liboapprover and a Telepathy-enabled LibreOffice are running. -Status 2012-03-23: + +* Demo modes + +This allows you to play with the interposing without having a telepathy +enabled setup: + + INTERCEPT=demo ./soffice -calc + +Create a bit of a document, type 'saveas' with spelling auto-correction +disabled, and bingo. + + +* Status 2012-03-23: * To do interesting things with this code build and run calc thus: @@ -52,7 +64,7 @@ empathy) and to have your opponent added and approved on both sides. 'saveme' to transfer your document as-is to the other side ... -Status 2012-03-20: +* Status 2012-03-20: * no LibO code depends on this module yet, so it is not built in a regular build, even if configured with --enable-telepathy, so cd tubes and make here diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 9aef84706354..1aba675c0ab0 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -158,7 +158,7 @@ public: void sendFile( rtl::OUString &localUri, TeleConference::FileSentCallback pCallback, void* pUserData); - boost::signals2::signal<void ( rtl::OUString &localUri )> sigFileReceived; + boost::signals2::signal<void ( const rtl::OUString &localUri )> sigFileReceived; /// Only for use with MainLoopFlusher GMainLoop* getMainLoop() const; |