telepathy-gabble: Rename most of GabbleJingle* to WockyJingle*

Will Thompson wjt at kemper.freedesktop.org
Thu Jan 17 04:57:38 PST 2013


Module: telepathy-gabble
Branch: master
Commit: efc093b82db19196d66e02100316295c0cc7e92e
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=efc093b82db19196d66e02100316295c0cc7e92e

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Tue Feb 21 16:11:32 2012 +0000

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;

---

 src/base-call-channel.c       |    4 +-
 src/base-call-channel.h       |    2 +-
 src/call-channel.c            |   80 ++--
 src/call-content.c            |   36 +-
 src/call-content.h            |    2 +-
 src/call-member-content.c     |   50 ++--
 src/call-member-content.h     |   10 +-
 src/call-member.c             |   66 ++--
 src/call-member.h             |   10 +-
 src/call-muc-channel.c        |   32 +-
 src/call-muc-channel.h        |    2 +-
 src/call-stream.c             |   80 ++--
 src/call-stream.h             |    2 +-
 src/ft-channel.c              |    4 +-
 src/ft-manager.c              |   12 +-
 src/google-relay.c            |   34 +-
 src/google-relay.h            |   12 +-
 src/gtalk-file-collection.c   |  158 ++++----
 src/gtalk-file-collection.h   |    4 +-
 src/jingle-content.c          |  534 +++++++++++++-------------
 src/jingle-content.h          |  158 ++++----
 src/jingle-factory.c          |  174 ++++----
 src/jingle-factory.h          |   68 ++--
 src/jingle-info-internal.h    |   16 +-
 src/jingle-info.c             |  200 +++++-----
 src/jingle-info.h             |  104 +++---
 src/jingle-media-rtp.c        |  402 ++++++++++----------
 src/jingle-media-rtp.h        |   92 +++---
 src/jingle-mint.c             |   40 +-
 src/jingle-mint.h             |    6 +-
 src/jingle-session.c          |  886 ++++++++++++++++++++--------------------
 src/jingle-session.h          |  130 +++---
 src/jingle-share.c            |   32 +-
 src/jingle-share.h            |    6 +-
 src/jingle-tp-util.c          |   26 +-
 src/jingle-tp-util.h          |    4 +-
 src/jingle-transport-google.c |  180 +++++-----
 src/jingle-transport-google.h |   48 ++--
 src/jingle-transport-iceudp.c |  162 ++++----
 src/jingle-transport-iceudp.h |   46 +-
 src/jingle-transport-iface.c  |  114 +++---
 src/jingle-transport-iface.h  |   96 +++---
 src/jingle-transport-rawudp.c |  126 +++---
 src/jingle-transport-rawudp.h |   46 +-
 src/jingle-types.h            |  146 ++++----
 src/media-channel-hold.c      |   16 +-
 src/media-channel-internal.h  |    4 +-
 src/media-channel.c           |  238 ++++++------
 src/media-factory.c           |   16 +-
 src/media-stream.c            |  170 ++++----
 src/media-stream.h            |    4 +-
 src/muc-channel.c             |    2 +-
 src/muc-channel.h             |    2 +-
 src/muc-factory.c             |    4 +-
 src/muc-factory.h             |    2 +-
 src/util.c                    |   36 +-
 src/util.h                    |    4 +-
 tests/twisted/main-debug.c    |    2 +-
 58 files changed, 2471 insertions(+), 2471 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-gabble/diff/?id=efc093b82db19196d66e02100316295c0cc7e92e


More information about the telepathy-commits mailing list