| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
| |
Makes Tartan happier.
|
|
|
|
| |
It has been removed in Telepathy 1.0 so redefine it ourself.
|
|
|
|
| |
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=43166#c0
|
|
|
|
|
|
|
|
|
|
|
| |
The improvements are:
* A new error code, WOCKY_XMPP_ERROR_POLICY_VIOLATION, added in RFC 6120
and used by Prosody's MUC rate-limiting;
* Fixes to the error parsing code when error conditions are not
recognised;
* Tweaks to WockyMuc's error signals to include the full GError and
WockyXmppErrorType in both.
|
| |
|
| |
|
|
|
|
|
| |
Really, WockyMuc::message-error should give the error text too, not just
the error code, but we'll come to that.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This renames the classes I'm moving to Wocky, and updates all the
remaining code to cope. A few things are missed out because it's only
reasonable to change them when the code is in Wocky:
• GABBLE_TYPE_STUN_SERVER_SOURCE (the GEnum for WockyStunServerSource)
can't be renamed easily because it is generated by Gabble's enumtype
thing.
• GABBLE_DEBUG_MEDIA.
Here's the program I used, for posterity.
#!/usr/bin/perl -pi
use strict;
BEGIN {
undef $/;
}
my @Classes = qw(Factory Session Transport_Iface Transport_IceUdp
Transport_RawUdp Transport_Google Content Info
Media_Rtp Relay);
for my $Class (@Classes) {
my $FullClass = "Jingle$Class";
$FullClass =~ s/_//g;
my $under_class = "jingle_" . lc($Class);
my $UNDER_CLASS = uc($under_class);
s/Gabble$FullClass/Wocky$FullClass/g;
s/gabble_$under_class/wocky_$under_class/g;
s/GABBLE_$UNDER_CLASS/WOCKY_$UNDER_CLASS/g;
s/GABBLE_TYPE_$UNDER_CLASS/WOCKY_TYPE_$UNDER_CLASS/g;
s/GABBLE_IS_$UNDER_CLASS/WOCKY_IS_$UNDER_CLASS/g;
}
s/GabbleGoogleRelay/WockyGoogleRelay/g;
s/gabble_google_relay/wocky_google_relay/g;
s/GABBLE_N_JINGLE_RELAY_TYPES/WOCKY_N_JINGLE_RELAY_TYPES/g;
s/gabble_stun_server/wocky_stun_server/g;
s/GABBLE_STUN_SERVER/WOCKY_STUN_SERVER/g;
# Can't rename GABBLE_TYPE_STUN_SERVER_SOURCE because it's generated. Blah.
s/GabbleStunServer/WockyStunServer/g;
my @Blah_Blah = qw(Candidate State Action Content_Senders Transport_Type
Transport_Protocol Candidate_Type Reason
Transport_State Dialect Content_State Media_Type Codec
Media_Description Feedback_Message Rtp_Header_Extension
Media_Profile);
for my $Class (@Blah_Blah) {
my $FullClass = "Jingle$Class";
$FullClass =~ s/_//g;
my $under_class = "jingle_" . lc($Class);
my $UNDER_CLASS = uc($under_class);
s/\b$FullClass/Wocky$FullClass/g;
s/\b_$FullClass/_Wocky$FullClass/g;
s/\b$under_class/wocky_$under_class/g;
s/\b$UNDER_CLASS/WOCKY_$UNDER_CLASS/g;
}
s/MAX_JINGLE_STATES/WOCKY_N_JINGLE_STATES/g;
s/JINGLE_IS_GOOGLE_DIALECT/WOCKY_JINGLE_DIALECT_IS_GOOGLE/g;
|
|
|
|
|
| |
This is harmless, but looks messy. It's leftover clutter from the
loudmouth era.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/tubes-channel.c
src/tubes-channel.h
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>
|
| |
| |
| |
| | |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
| |
| |
| |
| |
| |
| | |
This code came from GabbleTubesChannel.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
| |
| |
| |
| | |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
| |
| |
| |
| |
| |
| | |
This was removed GabbleTubesChannel.
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>
|
|/
|
|
|
| |
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49384
|
| |
|
| |
|
|
|
|
|
| |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49596
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
|
|
|
|
| |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49596
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
|
|
|
|
| |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49596
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/Makefile.am
For reasons I don't fully understand (presumably headers moving around
a bit?) I had to add includes of <telepathy-glib/gtypes.h> or
<telepathy-glib/interfaces.h> to:
• src/call-content.c
• src/private-tubes-factory.c
• src/protocol.c
• src/util.c
But otherwise this has been an uneventful merge!
|
| |
| |
| |
| | |
https://bugs.freedesktop.org/show_bug.cgi?id=27489
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The callback type for _gabble_connection_send_with_reply returned one of
these. All instances, bar two, returned
LM_HANDLER_RESULT_REMOVE_MESSAGE, which makes sense, because if you send
an IQ you had better be prepared to handle the reply.
When I removed lm_connection_send_with_reply(), I stopped
_gabble_connection_send_with_reply() paying attention to the return
value, with no apparent ill effects.
The two which returned LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS were:
• the disco pipeline's reply handler, in the case where the request is
no longer in the pipeline (such as in a timeout). I checked, and as
far as I can tell nothing is trying to scrape any information out of
zombie disco replies.
• the request pipeline's reply handler, in the same case. I couldn't be
bothered to check for this, but I don't think it will pose any ill
effects because normally the handler is the highest-priority
callback, so anyone trying to catch these would not catch the ones
which were not cancelled… which seems unlikely.
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Wocky is a little less convenient here, but
wocky_stanza_extract_errors() comes to the rescue.
|
| |
| |
| |
| | |
And also a couple of uses of lm_message_get_node().
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/connection.c
src/connection.h
src/ft-manager.c
src/jingle-content.c
src/jingle-factory.c
src/jingle-session.c
src/message-util.c
src/muc-channel.c
src/muc-channel.h
|
| | |
| | |
| | |
| | | |
There is a FIXME buried in here … but the tests pass.
|
| | |
| | |
| | |
| | |
| | | |
lm_message_node_has_namespace(), wocky_node_get_child_any_ns() and
lm_message_node_get_namespace() have exact equivalents in Wocky.
|
| | |
| | |
| | |
| | |
| | |
| | | |
WockyNode is the future.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
| |/
|/| |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The patch provides the changes required to make gabble
compile under mingw32.
- Index is replaced with strchr since index is deprecated
and not included in mingw32 sdk
- D_WIN32_WINNT=0x0501 is defined to make getnameinfo work
- And other compile fixes
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace g_(ptr_)array_free (foo, TRUE) and g_hash_table_destroy
with respectively g_(ptr_)array_unref (foo) and g_hash_table_unref.
I used this command to generate this patch:
for f in `find -name "*.c"`; do sed -i $f -re 's/g_ptr_array_free \(([^ ,]+), TRUE\)/g_ptr_array_unref \(\1\)/'; done
See Danielle's blog for explanation of possible bug _free can do:
http://blogs.gnome.org/danni/2011/11/16/mistakes-with-g_value_set_boxed/
|
| |
| |
| |
| |
| |
| | |
This updates Gabble for the latest spec.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=42652
|
| |
| |
| |
| | |
Fixes assumptions in the code where timestamp was assumed to be gint64.
|
| |
| |
| |
| |
| |
| |
| | |
Cast to the correct type so that Gabble compiles correctly on 32-bit.
I propose fixing this properly by using either gint64 or GDateTime in Wocky,
but not tonight.
|