pidgin: c744dcf4: merge of '16c47a3521f79a6091f5196bb3649c...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: c744dcf4d1215326fbb92b5178b3825a7bb35f19
Ancestor: 16c47a3521f79a6091f5196bb3649c2f9ca2922f
Ancestor: 52d17b90bdf3dffc10c5d87ea7ae1e59e7972436
Author: maiku at pidgin.im
Date: 2009-11-11T02:06:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c744dcf4d1215326fbb92b5178b3825a7bb35f19

Added files:
        libpurple/protocols/mxit/Makefile.am
        libpurple/protocols/mxit/Makefile.mingw
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/actions.h
        libpurple/protocols/mxit/aes.c
        libpurple/protocols/mxit/aes.h
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/cipher.c
        libpurple/protocols/mxit/cipher.h
        libpurple/protocols/mxit/filexfer.c
        libpurple/protocols/mxit/filexfer.h
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/formcmds.h
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/http.h
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/login.h
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/markup.h
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/multimx.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/profile.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/protocol.h
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/roster.h
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/mxit/splashscreen.h
        pidgin/pixmaps/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png
        pidgin/pixmaps/protocols/scalable/mxit.svg
Added directories:
        libpurple/protocols/mxit
Modified files:
        COPYRIGHT ChangeLog configure.ac
        libpurple/protocols/Makefile.am
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkmain.c
        pidgin/gtkprefs.c pidgin/pixmaps/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h po/POTFILES.in
Modified attrs:
        pidgin/pixmaps/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png

ChangeLog: 

merge of '16c47a3521f79a6091f5196bb3649c2f9ca2922f'
     and '52d17b90bdf3dffc10c5d87ea7ae1e59e7972436'