summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Cope with the default value of handle-type being changed in new tp-glibSjoerd Simons2011-06-254-6/+17
| | | | | | | | In recent versions of tp-glib the handle-type property defaults to TP_UNKNOWN_HANDLE_TYPE instead of 0. Update the various assertions which verify a channel doesn't get constructed with an unexpected handle type to accept both 0 and TP_UNKNOWN_HANDLE_TYPE so we're compatible with both versions.
* contact-channel: treat TP_UNKNOWN_HANDLE_TYPE has unset handle typeJonny Lamb2011-06-241-2/+4
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* gibber ibb bytestream: removeJonny Lamb2011-05-094-42/+0
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* stop using GibberXmppErrorJonny Lamb2011-05-047-23/+19
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* stop using gibber-namespaces.hJonny Lamb2011-05-0419-91/+100
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* tube-dbus: fix typoJonny Lamb2011-05-031-1/+1
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* avahi-olpc-activity-manager: ignore browser-found callbacks if disconnectedJonny Lamb2011-05-031-2/+6
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* contact: fix typoJonny Lamb2011-05-031-2/+3
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* remove all set but unused variablesJonny Lamb2011-05-039-57/+3
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* symbol-hacks: leave out wocky_debugJonny Lamb2011-04-281-2/+0
| | | | | | | It's not a function pointer with --disable-debug and we don't really care about that file anyway. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* capabilities: fix includesJonny Lamb2011-04-282-1/+3
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* src: remove annoying salut- prefixJonny Lamb2011-04-2881-414/+414
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* capabilities-set: rename to capability-setJonny Lamb2011-04-285-5/+5
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* capabilities: rename to capabilites-setJonny Lamb2011-04-282-1/+1
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* util: don't try and get caps out of something we can't readJonny Lamb2011-04-271-1/+6
| | | | | | | | | | | | Most link-local contacts in the contact factory will be created by the avahi contact manager in Salut, and so they will ultimately be SalutAvahiContact objects, but not all of them. One example of one which isn't is the LL contact which wocky ensures when creating the loopback porter in WockyMetaPorter, so let's not cast that to a SalutContact blindly. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* connection: pass even empty clients through to channel managersJonny Lamb2011-04-261-7/+3
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* connection, presence-cache: add comments for the "data forms equal" functionsJonny Lamb2011-04-252-0/+10
| | | | | | They differ. This is why. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* contact: no need to keep an old pointer array around when it's being replacedJonny Lamb2011-04-251-6/+2
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* contact, presence-cache: set a free func on unused pointer arraysJonny Lamb2011-04-252-2/+3
| | | | | | | | These will never have any elements in them by design, but it's not clear so be more explicit and set a free func on the new pointer array anyway. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* presence-cache: learn self caps if they've been announcedJonny Lamb2011-04-253-0/+33
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* connection: fix typo in update capabilities codeJonny Lamb2011-04-251-1/+1
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* caps-hash: calculate self hash using data forms tooJonny Lamb2011-04-251-2/+6
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* connection: let clients represent themselves with data formsJonny Lamb2011-04-251-19/+89
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* disco: reply from disco requests with data formsJonny Lamb2011-04-251-0/+18
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* presence-cache: remember data formsJonny Lamb2011-04-253-7/+81
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* contact, self: implement WockyXep0115Capabilities ifaceJonny Lamb2011-04-254-3/+86
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* caps-channel-manager: add data form argument to represent_clientJonny Lamb2011-04-224-5/+9
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* util: include salut-contact.h in the normal placeJonny Lamb2011-04-221-2/+2
| | | | | | | This was a temporary fix until I worked out the uuid problem, now fixed a couple of commits ago. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* contact: remove config.h include from headerJonny Lamb2011-04-221-2/+0
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* src: include uuid directory and link to libuuidJonny Lamb2011-04-221-0/+2
| | | | | | No idea how this worked before... Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* util: extract copying and sending a stanza from send_ll_pep_event() to ↵Jonny Lamb2011-04-221-24/+18
| | | | | | another function Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* pep: make salut_send_ll_pep_event part of public APIJonny Lamb2011-04-223-4/+2
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* util: add salut_send_ll_event functionJonny Lamb2011-04-222-0/+71
| | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* Merge branch 'caps'Jonny Lamb2011-04-223-413/+13
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure.ac lib/ext/wocky src/salut-caps-hash.c src/salut-caps-hash.h Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * caps-hash: use wocky_caps_hash_compute_from_listsJonny Lamb2011-02-041-73/+11
| | | | | | | | Signed-off-by: Jonny Lamb <jonny@debian.org>
| * caps-hash: remove caps hashing codeJonny Lamb2011-02-022-345/+4
| | | | | | | | | | | | This has moved to Wocky. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * presence-cache: use wocky's caps hashing codeJonny Lamb2011-02-021-1/+2
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | src/Makefile: only build enumtypes files for salut filesJonny Lamb2011-04-183-14/+17
| | | | | | | | | | | | Like in gabble. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | symbol-hacks: add some hacks to enable all wocky symbols be visible for pluginsJonny Lamb2011-04-184-0/+132
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | connection: add get_name() functionJonny Lamb2011-04-121-0/+8
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | connection: add get_session() functionJonny Lamb2011-04-121-0/+8
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | contact-manager: don't look up a contact in a NULL hash tableJonny Lamb2011-04-061-0/+3
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | connection: don't crash if we try and get self caps before connectingJonny Lamb2011-04-051-0/+3
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | connection: give the WockySession to create_sidecar_asyncJonny Lamb2011-04-051-4/+2
| | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* | Merge branch 'meta-porter'Jonny Lamb2011-04-0550-4085/+988
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/salut-connection.c src/salut-disco.c src/salut-self.c Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * | disco: use _extract_errors instead of extracting sub types manuallyJonny Lamb2011-04-051-8/+2
| | | | | | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * | disco: fix indentationJonny Lamb2011-04-051-1/+1
| | | | | | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * | muc-manager: don't pass on bad clique invites to other channel managersJonny Lamb2011-04-051-3/+3
| | | | | | | | | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * | disco: always free request structsJonny Lamb2011-04-041-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is this: 1. disco request is made 2. connection is disconnected 3. SalutDisco is disposed 4. SalutDisco dispose function g_cancellable_cancels each request 5. the porter (actually sending the IQ) realises it's been cancelled and completes in an idle 6. the disco callback deletes the request, dereferencing its disco pointer 7. but it's already been disposed, so assertion galore. There was previously an attempt to detect this but it was a bit shonky. Now the disco pointer is cleared when SalutDisco is disposed, then when the disco callback tries to delete the request it doesn't try to access any SalutDisco structures. Bingo. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| * | Revert "muc-manager: don't assert on no invite node"Jonny Lamb2011-04-041-2/+1
| | | | | | | | | | | | This reverts commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821.
View Lorry Controller Status