adium: 275309df: merge of '34d08f5fc867135104e6f69dc5484d...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 275309df32cc8e9f917529073caa4729aaa7d5a3
Ancestor: 34d08f5fc867135104e6f69dc5484d8893ec8291
Ancestor: f5376d42261b8efc3d889314df9896bb10d3fe16
Author: evands at pidgin.im
Date: 2009-11-22T18:50:45
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/275309df32cc8e9f917529073caa4729aaa7d5a3

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 finch/gntblist.c
        finch/libgnt/gntbox.c finch/libgnt/gntbutton.c
        finch/libgnt/gntcheckbox.c finch/libgnt/gntcombobox.c
        finch/libgnt/gntentry.c finch/libgnt/gntinternal.h
        finch/libgnt/gntlabel.c finch/libgnt/gntmain.c
        finch/libgnt/gntmenu.c finch/libgnt/gnttextview.c
        finch/libgnt/gnttree.c finch/libgnt/gntws.c
        libpurple/media.c libpurple/protocols/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/tests/test_jabber_jutil.c pidgin/gtkconv.c
        pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkmain.c pidgin/gtkprefs.c pidgin/gtksavedstatuses.c
        pidgin/gtkutils.c pidgin/pixmaps/Makefile.am
        pidgin/plugins/pidginrc.c
        pidgin/win32/nsis/pidgin-installer.nsi po/POTFILES.in
        po/af.po po/am.po po/ar.po po/az.po po/be at latin.po po/bg.po
        po/bn.po po/bs.po po/ca.po po/ca at valencia.po po/cs.po
        po/da.po po/de.po po/dz.po po/el.po po/en_AU.po po/en_CA.po
        po/en_GB.po po/eo.po po/es.po po/et.po po/eu.po po/fa.po
        po/fi.po po/fr.po po/ga.po po/gl.po po/gu.po po/he.po
        po/hi.po po/hu.po po/hy.po po/id.po po/it.po po/ja.po
        po/ka.po po/km.po po/kn.po po/ko.po po/ku.po po/lo.po
        po/lt.po po/mk.po po/mn.po po/my_MM.po po/nb.po po/ne.po
        po/nl.po po/nn.po po/oc.po po/pa.po po/pl.po po/ps.po
        po/pt.po po/pt_BR.po po/ro.po po/ru.po po/si.po po/sk.po
        po/sl.po po/sq.po po/sr.po po/sr at latin.po po/sv.po po/sw.po
        po/ta.po po/te.po po/th.po po/tr.po po/uk.po po/ur.po
        po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po po/zh_TW.po
Modified attrs:
        pidgin/pixmaps/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png

ChangeLog: 

merge of '34d08f5fc867135104e6f69dc5484d8893ec8291'
     and 'f5376d42261b8efc3d889314df9896bb10d3fe16'