summaryrefslogtreecommitdiff
path: root/tubes/source/manager.cxx
AgeCommit message (Collapse)AuthorFilesLines
2012-08-20tubes: move getContacts() to TeleManager where it belongs, I believeMatúš Kukan1-10/+85
Change-Id: I69ca3bde24890d809d8fad60398687c54aa1ca54
2012-08-16tubes: add include for clangMatúš Kukan1-0/+1
Change-Id: Ia0fd4c84b3c6e37250c6f0289bf0765977855bd2
2012-08-16tubes: simplify and make more readable, I believeMatúš Kukan1-59/+32
Change-Id: I83a4332d9947d03382b10ea050f26bf3ed544299
2012-08-16tubes: fix unittest again and simplifyMatúš Kukan1-38/+5
- killed GMailLoop, seems to work with g_main_context_iteration( NULL, TRUE); - added test for sending and also receiving file Change-Id: Ida11f875709dab71d404697e8c39fe4548f653b0
2012-08-16tubes: also prepare the Account Manager when creating; and simplifyMatúš Kukan1-58/+41
Change-Id: I7705d627d17f20c3c81de7aa4debbefc127354b0
2012-08-14tubes: use channel's signal closed to know when end the collaborationMatúš Kukan1-53/+7
Change-Id: I11e0aa2db3b41a166e23c85fd040f883e0d3be08
2012-08-08tubes: do not encode UUID into file name anymoreMatúš Kukan1-16/+9
Change-Id: I6c3828eb9c2f2d1810822e90006fc1af4bfcf277
2012-08-08Revert "tubes: mangle service name into file description"Matúš Kukan1-1/+1
Hopefully, it will work now, and we can use description field for UUID. This reverts commit 98411a76545737f4b2b956fb1cc137a924c64641. Change-Id: Ib6feeea861949c0cd316fda0295f13751de789e5
2012-08-08tubes: finish efforts to make TeleManager staticMatúš Kukan1-127/+81
Change-Id: I1d25a6074c3465a6e8c1df3127093d30d913b65d
2012-08-08tubes: make contacts dialog a member of Collaboration classMatúš Kukan1-0/+19
Change-Id: Ib50b550f9486bc1abfeefd5d1aac57c0d712ec04
2012-08-08tubes: handle TeleConference internally in CollaborationMatúš Kukan1-6/+10
Hopefully, this simplifies the tubes <-> app interface Change-Id: I8933fde490941b259d5d133972db26a09ab380d5
2012-08-04tubes: do not queue incoming packetsMatúš Kukan1-1/+2
Change-Id: Ida0f3b9ce7cebdb0517457900d2b0b2377e6c8ab
2012-08-04tubes: avoid boost::signaling received packetsMatúš Kukan1-2/+2
Change-Id: I63e262aa05ec7c06c15eaf74201b6ac1966e2e56
2012-08-04tubes: avoid ugly SAL_DLLPUBLIC_EXPORT hereMatúš Kukan1-3/+3
Change-Id: Icd839cd70dd32f766ad52d74fcf3cff28281da7e
2012-08-04tubes: remove unused parameterMatúš Kukan1-11/+6
Change-Id: I22cd7cc866696dd7def7d7cb20d00da68d408137
2012-08-04tubes: call the function directlyMatúš Kukan1-17/+0
Change-Id: Ic9f02f7df77fabaec585c3f53bf0a86044bf27bb
2012-08-04tubes: implement another way for demoing collaborationMatúš Kukan1-9/+47
This way it affects code ~only internally in tubes/ module. Change-Id: I1fd1fa460d51ad57ae2f6df0adeb5fadfc7a8c95
2012-08-04tubes: stop collaborating when the account gets off-lineMatúš Kukan1-0/+26
Change-Id: Ic6f1bc41bc212e0c36751168f1204c41ebe0ce61
2012-08-04tubes: stop collaborating when the contact leavesMatúš Kukan1-0/+25
Change-Id: I779aededb95eac6cbfb2fec3e97d207704244e25
2012-08-04tubes: make TeleManager::getConference() staticMatúš Kukan1-1/+1
Change-Id: Ic7023a40eb2f09802b100d9317c0a6a66d901476
2012-08-02tubes: impose strict ordering on 1-1 collaborationMatúš Kukan1-1/+1
- master (the one who started the session) echoes back packets from slave, who only then, after receiving own commands executes them Change-Id: I8b5a1d1bae0d665b65fe2ec0121430178728274d
2012-07-26tubes: send file when inviting contact to MUC collaborationMatúš Kukan1-1/+2
- add UUID info to TeleConference - let SendFile function take argument for contact instead of getting contact from the channel info, what couldn't work for MUC channel Change-Id: I4dc45c084966a030ff4b503e192d452797f0bfdd
2012-07-26tubes: clean this outMatúš Kukan1-3/+5
Change-Id: I7d4cafbe51695c0ff36480311858b9167344c119
2012-07-26tubes: move mbChannelReadyHandlerInvoked to pImplMatúš Kukan1-5/+14
Change-Id: If2ddd8bdcb11727be719e8966aa689fbabd94f44
2012-07-26tubes: kill double-singletonning of TeleManagerMatúš Kukan1-41/+2
I am not sure why it was introduced in 0dae49a03c9b4816d8cdde69e30bcd2db2e30724 and hope that it's safe to remove it now. Change-Id: I62f0ac230a83473386eabc45c9fcc387f62631e3
2012-07-26tubes: TeleManger's GMainLoop* now unusedMatúš Kukan1-30/+5
Change-Id: I99b482a60155c596c4b64534f62ce4c9d4d9a94b
2012-07-26tubes: resurrect unit test to serve againMatúš Kukan1-2/+5
- make it subsequent test to be less annoying - we again inherit from CppUnit::TestFixture - currently there is no test that we've received the sent packet - nor any test for received file - to prevent exporting more symbols we link directly tubes' object files Change-Id: I79edf0c701f8c46eb45d507266f6dafc0c8eeea2
2012-07-24tubes: init TeleManager in desktopMatúš Kukan1-0/+17
- register clients when we run --invisible - create ScDocFuncSend only if we are going to use it Change-Id: I7e33cd5a2e42e34a055146dc6c2bdac3657d6529
2012-07-23tubes: do not include telepathy-glib.h in public headersMatúš Kukan1-0/+2
Change-Id: Ib2c88f2f1fc1c9ebffbbdc9896045c3d1e5b719c
2012-07-23tubes: create TeleConferenceImpl to hide more details from publicMatúš Kukan1-2/+2
Change-Id: If1be001e336991218893e3bc455a16e73ecaab0f
2012-07-23tubes: get local callbacks out of classMatúš Kukan1-5/+5
Change-Id: I7e43d9990827c4c7d86d947e7d71a94b686642fc
2012-07-22tubes: do not crash if there is no TeleManager yetMatúš Kukan1-1/+1
Change-Id: I042c773f071d336c7d402ed7bca2a33b3a998d50
2012-07-21tubes: do not include file-transfer-helper.h in public headersMatúš Kukan1-4/+10
Change-Id: Ie66069a37c70b43cbee34130b5b63967a1c9f033
2012-07-20tubes: use SAL_WARN SAL_LOGMatúš Kukan1-4/+2
Change-Id: Ic0c291183c63bb5c4a0a7e54f80c3c8f23349a3d
2012-07-20tubes: remove unused parametersMatúš Kukan1-5/+3
Change-Id: Ia1c683f5b9245d1673a610901636921619f47406
2012-07-20tubes: clean up commented out code, headersMatúš Kukan1-45/+6
Change-Id: I5962fb38d2320199e9c45c6f339131755f817960
2012-07-20tubes: move ScDocFuncRecv::fileReceived to TeleManager_fileReceivedMatúš Kukan1-1/+75
Change-Id: Ie2ab2c2d545f6fcbdc21171868c99b1756c90792
2012-07-20tubes: send a file for collaboration when buddy session startsMatúš Kukan1-3/+39
Channels for file and for tube are independent in telepathy, so let sender create UUID and pass it to receiver, who then can bind the document to the channel. UUID for tube channel goes through telepathy. UUID for file channel is encoded in the filename for now. Tubes specific CreateDocFunc is re-introduced, so we could set current UUID after file is received and when the document is being constructed, get channel from TeleManager with this UUID. This is not immune to constructing other documents in the middle of binding proccess. Change-Id: I57c7e57a5d7d3ccd7d94677a8cf2719c78baa2fd
2012-07-20tubes: fix typo in namesMatúš Kukan1-2/+2
Change-Id: Ibaab0a1ed5774f400bc14e67742daaf06fcab391
2012-07-17tubes: do not freeze when preparing Account ManagerMatúš Kukan1-12/+1
We don't need to wait for our capabilities update to propagate from one account via the network and back. Since e3d1001c08d255c588ed6ca93f3b58b2161cce45 ContactList returns all online contacts regardless of its capabilities. Change-Id: Icf8982dd1e6aedec4f21920ff8020f8547d7b855
2012-07-17tubes: guard unref() against "accidental" callsEike Rathke1-1/+1
Change-Id: I73b0f8faaa9b6d0707153f3150ca531a33cb0dd3
2012-07-17tubes: remove now unused code, when we don't use maConferencesMatúš Kukan1-66/+0
Change-Id: I403253793791236eaf8e9fd3fc72489ebd447d99
2012-07-17tubes: associate the document directly with TeleConferenceMatúš Kukan1-28/+20
Packet communication now goes directly through TeleConference and TeleManager is used only for receiving files and new channels. This should also allow collaboration of different documents with different contacts independently. Change-Id: Iaf719dce156f1c4c9edc3db4ff0964dec0e0c944
2012-07-17tubes: remove unused TeleConference::maSessionIdMatúš Kukan1-5/+3
Change-Id: Ic6100aa03764cd62b5426e4ec1f3aeb085241c16
2012-07-17tubes: remove unused TeleManager::mbAcceptIncomingMatúš Kukan1-4/+3
Change-Id: Idb4f8e4e47be88efa9e199588936cf426b3e1ce4
2012-07-17tubes: split TeleManager::connect method.Matúš Kukan1-25/+37
Use createAccountManager instead. Optionally also register clients for accepting tubes. Will be used more later. Change-Id: I353d45e95fa130c0c578b74d016b650039358ea7
2012-07-17tubes: make TeleManager::startGroupSession work and use itMatúš Kukan1-14/+12
2012-07-17tubes: make conference hold a TpDBusTubeChannelWill Thompson1-3/+3
It already was, actually. :)
2012-07-17tubes: move Accept() logic into conferenceWill Thompson1-57/+9
This makes sense, because the flow for Accept() and Offer() is basically symmetrical, and then conference becomes solely responsible for the handling of channels once they've been requested/given to us. While we're at it we also fix both code paths to work correctly if the state becomes Open before Accept/Offer returns (which is possible).
2012-07-17cleanout flushLoopEike Rathke1-12/+0
relict from testing era, not needed anymore