summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-16Revert "Disable deprecation warnings for the stable branch"HEADmasterWill Thompson1-2/+1
This reverts commit 18aa2dc53316a85be7f23d46190b44cb090d2c7f. This isn't the stable branch.
2012-11-16Merge branch 'telepathy-salut-0.8'Will Thompson3-1/+15
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
2012-11-16Bump nano-version to 0.8.1.1Will Thompson1-1/+1
2012-11-16Version 0.8.1Will Thompson1-2/+2
2012-11-16NEWS for 0.8.1Will Thompson1-1/+8
2012-11-16Update Wocky snapshot to fix iChat interop.Will Thompson1-0/+0
https://bugs.freedesktop.org/show_bug.cgi?id=51527
2012-11-16Disable deprecation warnings for the stable branchWill Thompson1-1/+2
2012-11-16NEWS for the patches I did not revertWill Thompson1-1/+8
2012-11-16Revert "Use TP_ERROR instead of long-deprecated TP_ERRORS"Will Thompson22-150/+150
This reverts commit cd23b9a835033f837fe266b6eff18df64c41f8c8.
2012-11-16Revert "Use non-deprecated TpIntset APIs"Will Thompson3-34/+31
This reverts commit 9ef6d455d1ea4f48bfe300a1b3c5a89061edc81d.
2012-11-16Revert "Use non-deprecated TpMessage APIs"Will Thompson1-10/+9
This reverts commit 5c54074f0490f4b5f6b31ecd8f5df011ca32af83.
2012-11-16Revert "Set G_MESSAGES_DEBUG during testing"Will Thompson1-2/+0
This reverts commit b6c32f8840ec4598885108f89d58a5a74ee04af8.
2012-11-16Revert "Remove deprecated tp_handle_ref/unref"Will Thompson10-1/+115
This reverts commit c452d94fabbdf31c85963c81df3d5d566148f968.
2012-11-16Revert "Update Wocky snapshot"Will Thompson1-0/+0
This reverts commit caa206879f23ab24beacdda77e10ab972faff6e4.
2012-11-16Revert "NEWS for the patches I just backported"Will Thompson1-14/+1
This reverts commit 0eef9ba8a5a68854be43e655a6d3d9e667d648ca.
2012-11-16Revert "Use telepathy-glib's versioned deprecation warnings."Will Thompson46-67/+7
This reverts commit a73b0c13faaab99927c44bebac7088d5c24ba6ea.
2012-11-16Use telepathy-glib's versioned deprecation warnings.Will Thompson46-7/+67
2012-11-16NEWS for the patches I just backportedWill Thompson1-1/+14
2012-11-16Update Wocky snapshotWill Thompson1-0/+0
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.
2012-11-16Don't crash when closing a roomlist channel.Will Thompson2-11/+16
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.
2012-11-16tubes: don't use an uninitialized tube_id.Will Thompson1-3/+8
gcc rightly points out that tube_id may be uninitialized if extract_tube_information() returns false.
2012-11-16Remove deprecated tp_handle_ref/unrefXavier Claessens10-115/+1
2012-11-16Set G_MESSAGES_DEBUG during testingSimon McVittie1-0/+2
The same as Gabble commit cbfa9d06.
2012-11-16Use non-deprecated TpMessage APIsSimon McVittie1-9/+10
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594 Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
2012-11-16Use non-deprecated TpIntset APIsSimon McVittie3-31/+34
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594 Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
2012-11-16Use TP_ERROR instead of long-deprecated TP_ERRORSSimon McVittie22-150/+150
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594 Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
2012-11-16contact-manager: safely return if called after having cleaned upJonny Lamb1-6/+10
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>
2012-11-12Update Wocky snapshotWill Thompson1-0/+0
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.
2012-08-28NEWS: updatedJonny Lamb1-1/+9
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-08-28configure: bump dependency on tp-glibJonny Lamb1-1/+1
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-08-28Merge branch 'cheerio-tubes'Jonny Lamb27-4488/+2282
Conflicts: src/tubes-channel.c Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-08-02text muc channel test: remove message testsJonny Lamb1-98/+0
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>
2012-08-02request-muc-tubes test: add TODO explaining why a test is commentedJonny Lamb1-2/+5
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-08-02muc-channel: remove ::appeared signal, replace with is_respawning checkJonny Lamb2-20/+8
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-08-02tubes-manager: add a comment about who owns new channelsJonny Lamb1-0/+2
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-08-02tubes: use guint64s for all tube IDsJonny Lamb7-48/+45
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-07-24tubes-manager: correct logic in looking up existing tubesJonny Lamb1-1/+1
Good catch, Will! Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-07-24tubes-manager: fix coding styleJonny Lamb1-3/+3
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-07-02Don't crash when closing a roomlist channel.Will Thompson2-11/+16
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.
2012-07-02tubes: don't use an uninitialized tube_id.Will Thompson1-3/+8
gcc rightly points out that tube_id may be uninitialized if extract_tube_information() returns false.
2012-06-07muc tests: add test to ensure the Text MUC only appears when necessaryJonny Lamb2-0/+417
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-06-06muc-channel: don't pretend to be connected after disposingJonny Lamb1-0/+2
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-06-06muc-manager: only expose the text MUC channel when necessaryJonny Lamb5-82/+193
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-06-06tubes-manager: replace emit_new_channels with singular versionJonny Lamb1-7/+2
We're signalling the creation of only one channel anyway. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-06-06muc-manager: only signal channels when they're 'ready'Jonny Lamb3-5/+165
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>
2012-06-05muc-channel: remove unused code to hold pointer to muc managerJonny Lamb1-9/+0
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-05-31tubes-channel: removeJonny Lamb9-2700/+0
Hooray! Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-05-31tube-{iface,dbus,stream}: remove tubes-channel propertyJonny Lamb7-49/+7
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-05-31muc-manager: remove all old TubesChannel referencesJonny Lamb3-217/+4
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-05-31tubes-manager: remove all old TubesChannel referencesJonny Lamb1-120/+0
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>