diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2012-02-21 16:11:32 +0000 |
---|---|---|
committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-12-11 16:47:19 +0000 |
commit | efc093b82db19196d66e02100316295c0cc7e92e (patch) | |
tree | 175d69adcb0289d26365b16a689197a19c98b6bb /src/muc-channel.c | |
parent | 0f1435f548071f873d7626643f250b04b53931c9 (diff) | |
download | telepathy-gabble-efc093b82db19196d66e02100316295c0cc7e92e.tar.gz |
Rename most of GabbleJingle* to WockyJingle*
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;
Diffstat (limited to 'src/muc-channel.c')
-rw-r--r-- | src/muc-channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/muc-channel.c b/src/muc-channel.c index a685b07cf..74cde99a1 100644 --- a/src/muc-channel.c +++ b/src/muc-channel.c @@ -4059,7 +4059,7 @@ gabble_muc_channel_request_call_finish (GabbleMucChannel *gmuc, gboolean gabble_muc_channel_handle_jingle_session (GabbleMucChannel *self, - GabbleJingleSession *session) + WockyJingleSession *session) { GabbleMucChannelPrivate *priv = self->priv; |