summaryrefslogtreecommitdiff
path: root/tubes
AgeCommit message (Collapse)AuthorFilesLines
2012-07-23tubes: update unused build.lstMatúš Kukan1-1/+1
Change-Id: I98842967fadc26efe8295e3acf3bcfc513b68591
2012-07-22tubes: do not crash if there is no TeleManager yetMatúš Kukan1-1/+1
Change-Id: I042c773f071d336c7d402ed7bca2a33b3a998d50
2012-07-21tubes: small cleaningMatúš Kukan1-3/+0
Change-Id: I15337276f21febba44b84d3618fedfc08013a3da
2012-07-21tubes: do not include file-transfer-helper.h in public headersMatúš Kukan5-20/+18
Change-Id: Ie66069a37c70b43cbee34130b5b63967a1c9f033
2012-07-21tubes: remove TelePacket, it's just simple stringMatúš Kukan7-139/+15
Change-Id: Iabfb50454c573ac9c01aba1b309822c4ef6fcc73
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úš Kukan2-46/+6
Change-Id: I5962fb38d2320199e9c45c6f339131755f817960
2012-07-20tubes: move ScDocFuncRecv::fileReceived to TeleManager_fileReceivedMatúš Kukan3-4/+79
Change-Id: Ie2ab2c2d545f6fcbdc21171868c99b1756c90792
2012-07-20tubes: send a file for collaboration when buddy session startsMatúš Kukan5-9/+66
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: improve contacts dialogMatúš Kukan1-10/+20
- do not show until it's ready - do not close it with buttons - buttons for both 1-1 and MUC sessions - display all online contacts Change-Id: Idfbea7ffdf76ef3f31dbeeefe62d69cb5e3e64b7
2012-07-17tubes: guard unref() against "accidental" callsEike Rathke1-1/+1
Change-Id: I73b0f8faaa9b6d0707153f3150ca531a33cb0dd3
2012-07-17tubes: add possibility to invite contacts to MUCMatúš Kukan2-0/+11
Change-Id: Ia27c725aff1d16d21ee1f5abcfff9a107bd87a82
2012-07-17tubes: selectively export TeleManager's symbolsMatúš Kukan1-15/+14
Change-Id: I70053c4b1e31ecd281701bab692764ef581e0f57
2012-07-17tubes: remove now unused code, when we don't use maConferencesMatúš Kukan4-104/+1
Change-Id: I403253793791236eaf8e9fd3fc72489ebd447d99
2012-07-17tubes: associate the document directly with TeleConferenceMatúš Kukan4-42/+32
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úš Kukan3-9/+5
Change-Id: Ic6100aa03764cd62b5426e4ec1f3aeb085241c16
2012-07-17tubes: remove unused TeleManager::mbAcceptIncomingMatúš Kukan3-10/+7
Change-Id: Idb4f8e4e47be88efa9e199588936cf426b3e1ce4
2012-07-17tubes: split TeleManager::connect method.Matúš Kukan3-37/+69
Use createAccountManager instead. Optionally also register clients for accepting tubes. Will be used more later. Change-Id: I353d45e95fa130c0c578b74d016b650039358ea7
2012-07-17tubes: warning guard for boost/signals2.hpp [-Werror=shadow]Eike Rathke3-1/+46
boost 1.44 boost/signals2.hpp with gcc 4.6.3 causes solver/unxlngx6/inc/boost/signals2/detail/slot_template.hpp:122:7: error: declaration of ‘slot’ shadows a member of 'this' [-Werror=shadow] Change-Id: I276e008aaebaca9c115bedc58d29c93c6dc526b8
2012-07-17tubes: fix makefiles after rebaseMatúš Kukan1-1/+1
Change-Id: I99a0dd6765d57c4a1d842b25d600d760930704fa
2012-07-17tubes: make TeleManager::startGroupSession work and use itMatúš Kukan2-17/+17
2012-07-17tubes: use new TeleManager::get() method without parameterMatúš Kukan1-0/+1
2012-07-17tubes: cleanup abstraction, and add in-process demo modeMichael Meeks3-7/+19
Pass const rtl::OUString &s around instead of random pointers. Allow sc/ to build and work without telepathy enabled. Add aforementioned demo mode hack.
2012-07-17tubes: tweak makefilesMatúš Kukan2-21/+15
2012-07-17tubes: mention local copy of needed telepathy-glibEike Rathke1-0/+9
2012-07-17conference: remove a stray dbus-glib import.Will Thompson1-1/+0
This is no longer needed since the switch to using GDBus for the tube connection.
2012-07-17tubes: use tp_dbus_tube_channel_offer/accept_asyncWill Thompson2-118/+49
I added these to the recently-released telepathy-glib 0.18.0 mainly to let us simplify the code here. With this new API, tp-glib takes care of waiting for the state changes, creating the GDBusConnection, etc.
2012-07-17tubes: make conference hold a TpDBusTubeChannelWill Thompson3-17/+19
It already was, actually. :)
2012-07-17tubes: use GDBus rather than libdbusWill Thompson3-77/+111
GDBus is the future. And TpDBusTubeChannel will ultimately give us a GDBusConnection, so...
2012-07-17tubes: move Accept() logic into conferenceWill Thompson4-119/+98
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-17tubes: reduce code duplication when opening connectionWill Thompson2-37/+25
2012-07-17cleanout flushLoopEike Rathke3-23/+0
relict from testing era, not needed anymore
2012-07-17silence WaE incompatible pointer type and unused parametersEike Rathke1-10/+18
* "passing argument 1 of ‘gtk_message_dialog_format_secondary_markup’ from incompatible pointer type" * dialog was in fact constructed as GtkMessageDialog using gtk_message_dialog_new_with_markup(), so use it as such * "passing argument 1 of ‘gtk_widget_destroy’ from incompatible pointer type" * use GTK_WIDGET() on dialog GtkMessageDialog* * "passing argument 1 of ‘g_object_get_data’ from incompatible pointer type" * use G_OBJECT on dialog GtkWidget* * "passing argument 1 of ‘gtk_dialog_set_response_sensitive’ from incompatible pointer type" * use GTK_DIALOG on dialog GtkWidget* * "passing argument 1 of ‘gtk_message_dialog_set_image’ from incompatible pointer type" and "passing argument 1 of ‘gtk_dialog_add_buttons’ from incompatible pointer type" * use GTK_MESSAGE_DIALOG() on dialog GtkWidget* * "passing argument 1 of ‘g_object_set_data_full’ from incompatible pointer type" * use G_OBJECT() on dialog GtkWidget*:x * "passing argument 3 of ‘g_signal_connect_data’ from incompatible pointer type" * use G_CALLBACK() on dialog_response_cb * "passing argument 1 of ‘gtk_window_set_skip_taskbar_hint’ from incompatible pointer type" * use GTK_WINDOW() on dialog GtkWidget* How awful C is :-/ GtkMessageDialog is a GtkDialog is a GtkWindow is a GtkWidget is a GObject, but still ...
2012-07-17silence WaE unused-parameterEike Rathke1-0/+8
2012-07-17tubes: work around “We are supposed to handle only one channel” bug.Will Thompson2-0/+32
This is the bug which breaks the first request after the offerer signed in.
2012-07-17tubes: quick hack to allow running two instancesWill Thompson3-7/+12
To record a screencast, I wanted to get two instances of LibreOffice running in the same session. But the Client object(s) claim D-Bus names, so initializing the second instance failed. This patch changes things so that if LIBO_TUBES=master, no Client objects are created. As a result, only the slave can receive files.
2012-07-17tubes: make the contacts list show somethingMichael Meeks2-2/+2
2012-07-17Include packet in packetReceived signals.Will Thompson4-27/+16
(And also signalify receiving files.)
2012-07-17tubes: add a shared TeleManager singletonWill Thompson2-1/+46
Yes, this is in addition to the existing TeleManagerImpl singleton. This class needs to be properly split in half: one Manager part from which the UI can request new sessions and which signals the appearance of new incoming sessions, and another Session part representing the shared editing session (which in turn owns one or more Conferences, which owns exactly one tube, as now). The Manager will dispatch incoming files to the appropriate Conference by UUID or similar. But for now, Michael is opening a new window with the received file, so we want incoming and outgoing events to go to both windows so that it works well enough for a demo.
2012-07-17tubes: replace packetReceived link with a boost signalWill Thompson3-21/+25
2012-07-17ContactList: ask for avatar data for our contactsWill Thompson1-0/+1
2012-07-17tubes: delete MainLoopFlusherWill Thompson2-44/+0
This doesn't actually seem to have any effect on the test passing or failing.
2012-07-17tubes: reinstate erroneously-commented unrefsWill Thompson1-2/+2
I think I commented these out while hunting stack corruption.
2012-07-17tubes: update readme, get -something- working wrt. document transferMichael Meeks1-0/+18
2012-07-17tubes: push sent packets onto the incoming queue.Will Thompson3-7/+24
This ensures that our changes are echoed locally as well as being sent to the peer.
2012-07-17tubes: delete some loop-spinning debugWill Thompson1-2/+0
2012-07-17tubes: calm debug thrash and get master connections right.Michael Meeks1-3/+0