pidgin: bef8fb78: merge of '41fc76b7aed4cc32bd70c6834f747b...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: bef8fb7866a892b8957a2c23af4cc1975a78c825
Ancestor: 41fc76b7aed4cc32bd70c6834f747bad0b91a37b
Ancestor: 7dbbe123fdbec4e885f0b2e672ce9e2a05c305c9
Author: markdoliner at pidgin.im
Date: 2008-05-15T09:48:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bef8fb7866a892b8957a2c23af4cc1975a78c825

Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API autogen.sh
        configure.ac finch/gntlog.h finch/gntrequest.c
        finch/gntsound.c finch/libgnt/gntbindable.c
        finch/libgnt/gntbindable.h finch/libgnt/gntentry.c
        finch/libgnt/gntmenu.c finch/libgnt/gntwm.c
        libpurple/Makefile.am libpurple/blist.c libpurple/blist.h
        libpurple/conversation.h libpurple/eventloop.h
        libpurple/network.c libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/dns_sd_proxy.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/win32/posix.uname.c
        libpurple/protocols/jabber/win32/utsname.h
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/prpl.h
        libpurple/util.c libpurple/util.h pidgin/gtkblist.c
        pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtknotify.c
        pidgin/gtkplugin.c pidgin/gtksound.c pidgin/gtkstatusbox.c
        pidgin/gtkthemes.h pidgin/gtkutils.c pidgin/pixmaps/logo.png
        pidgin/plugins/history.c
        pidgin/win32/nsis/translations/lithuanian.nsh po/ChangeLog
        po/ca.po po/de.po po/fi.po po/fr.po po/hu.po po/lt.po
        po/sv.po

ChangeLog: 

merge of '41fc76b7aed4cc32bd70c6834f747bad0b91a37b'
     and '7dbbe123fdbec4e885f0b2e672ce9e2a05c305c9'