pidgin.vv: df21a020: merge of '2a69c36548c533b1a96f40e1ee6af5...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: df21a0203c74d88008c39face4d2ddfc84a03dc8
Ancestor: 2a69c36548c533b1a96f40e1ee6af57c06ab1bad
Ancestor: 6a12860d1ff4413ceb4ee4796d32912e52573269
Author: maiku at soc.pidgin.im
Date: 2008-12-13T08:49:16
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/df21a0203c74d88008c39face4d2ddfc84a03dc8

Deleted entries:
        pidgin/pixmaps/protocols/16/facebook.png
        pidgin/pixmaps/protocols/22/facebook.png
        pidgin/pixmaps/protocols/48/facebook.png
        pidgin/pixmaps/status/48/log-in.png
        pidgin/pixmaps/status/48/log-out.png
Renamed entries:
        pidgin/pixmaps/status/48/rtl/login.png to pidgin/pixmaps/status/48/rtl/log-in.png
        pidgin/pixmaps/status/48/rtl/logout.png to pidgin/pixmaps/status/48/rtl/log-out.png
Added files:
        finch/libgnt/gntinternal.h
        pidgin/pixmaps/status/11/rtl/log-in.png
        pidgin/pixmaps/status/11/rtl/log-out.png
        pidgin/pixmaps/status/48/invisible.png
        pidgin/pixmaps/status/48/log-in.png
        pidgin/pixmaps/status/48/log-out.png
Modified files:
        COPYRIGHT ChangeLog Makefile.am autogen.sh finch/gntblist.c
        finch/gntdebug.c finch/libgnt/Makefile.am
        finch/libgnt/gntbindable.c finch/libgnt/gntcolors.c
        finch/libgnt/gntentry.c finch/libgnt/gntfilesel.c
        finch/libgnt/gntkeys.c finch/libgnt/gntmain.c
        finch/libgnt/gntstyle.c finch/libgnt/gnttextview.c
        finch/libgnt/gntutils.c finch/libgnt/gntwm.c
        libpurple/media.c libpurple/media.h
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/myspace/README
        libpurple/protocols/myspace/message.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/purple-remote libpurple/request.c
        libpurple/roomlist.c libpurple/util.c
        libpurple/win32/libc_interface.c libpurple/win32/targets.mak
        pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtknotify.c pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtksavedstatuses.c pidgin/gtksmiley.c
        pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/history.c pidgin/win32/winpidgin.c 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/id.po po/it.po po/ja.po po/ka.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/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/status/11/rtl/log-in.png
        pidgin/pixmaps/status/11/rtl/log-out.png
        pidgin/pixmaps/status/48/invisible.png
        pidgin/pixmaps/status/48/log-in.png
        pidgin/pixmaps/status/48/log-out.png

ChangeLog: 

merge of '2a69c36548c533b1a96f40e1ee6af57c06ab1bad'
     and '6a12860d1ff4413ceb4ee4796d32912e52573269'