Age | Commit message (Collapse) | Author | Files | Lines |
|
This reverts commit 18aa2dc53316a85be7f23d46190b44cb090d2c7f. This isn't
the stable branch.
|
|
This updates the Wocky snapshot to include the stanza namespace fixes.
They don't seem to cause any problems.
Conflicts:
NEWS
configure.ac
lib/ext/wocky
src/tubes-channel.c
|
|
|
|
|
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=51527
|
|
|
|
|
|
This reverts commit cd23b9a835033f837fe266b6eff18df64c41f8c8.
|
|
This reverts commit 9ef6d455d1ea4f48bfe300a1b3c5a89061edc81d.
|
|
This reverts commit 5c54074f0490f4b5f6b31ecd8f5df011ca32af83.
|
|
This reverts commit b6c32f8840ec4598885108f89d58a5a74ee04af8.
|
|
This reverts commit c452d94fabbdf31c85963c81df3d5d566148f968.
|
|
This reverts commit caa206879f23ab24beacdda77e10ab972faff6e4.
|
|
This reverts commit 0eef9ba8a5a68854be43e655a6d3d9e667d648ca.
|
|
This reverts commit a73b0c13faaab99927c44bebac7088d5c24ba6ea.
|
|
|
|
|
|
There are no particularly significant changes, but this pulls in the fix
for https://bugs.freedesktop.org/show_bug.cgi?id=37701 among other
things.
|
|
TpBaseChannel requires that the 'close' vfunc be implemented, even if
the implementation is literally tp_base_channel_destroyed() because
there is no clean-up to do. As a result, Empathy pre-emptively
requesting a roomlist channel when you open the Join Room… dialog would
crash Salut when you close that dialog.
|
|
gcc rightly points out that tube_id may be uninitialized if
extract_tube_information() returns false.
|
|
|
|
The same as Gabble commit cbfa9d06.
|
|
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
|
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
|
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
|
The OLPC activity manager's removed-service callback was looking up a
contact after the contact manager had cleaned up (but not disposed)
which was causing an assertion. The activity manager should arguably
disconnect from said signals...
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
There are no particularly significant changes, but this pulls in the fix
for https://bugs.freedesktop.org/show_bug.cgi?id=37701 among other
things.
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Conflicts:
src/tubes-channel.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
They're totally cumbersome and they're tested elsewhere in other
tests, so let's just remove them here. I actually forgot to implement
them at first as they're way easier to do in non-ll XMPP.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Good catch, Will!
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
TpBaseChannel requires that the 'close' vfunc be implemented, even if
the implementation is literally tp_base_channel_destroyed() because
there is no clean-up to do. As a result, Empathy pre-emptively
requesting a roomlist channel when you open the Join Room… dialog would
crash Salut when you close that dialog.
|
|
gcc rightly points out that tube_id may be uninitialized if
extract_tube_information() returns false.
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
We're signalling the creation of only one channel anyway.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
It's nicer to only give the channel back when it's actually ready and
joined instead of before hand. If it is returned too early gibber can
be made to assert on its connection status. Gabble already does this.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Hooray!
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|