pidgin: f3e133f1: merge of 'a2c4bf662d1fdab8c870c1ebbca309...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: f3e133f1a010353a451f656cb3e38a746e84ff7d
Ancestor: a2c4bf662d1fdab8c870c1ebbca30968af4bb80a
Ancestor: caaa65e1c157e6cb43219237f88a4ad298f3bbf5
Author: markdoliner at pidgin.im
Date: 2008-04-28T06:27:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f3e133f1a010353a451f656cb3e38a746e84ff7d

Deleted entries:
        finch/libgnt/pygnt finch/libgnt/pygnt/Files.txt
        finch/libgnt/pygnt/Makefile.am
        finch/libgnt/pygnt/Makefile.make
        finch/libgnt/pygnt/README.txt finch/libgnt/pygnt/common.c
        finch/libgnt/pygnt/common.h finch/libgnt/pygnt/dbus-gnt
        finch/libgnt/pygnt/example finch/libgnt/pygnt/example/rss
        finch/libgnt/pygnt/example/rss/gnthtml.py
        finch/libgnt/pygnt/example/rss/gntrss-ui.py
        finch/libgnt/pygnt/example/rss/gntrss.py
        finch/libgnt/pygnt/file.py finch/libgnt/pygnt/gendef.sh
        finch/libgnt/pygnt/gnt.override
        finch/libgnt/pygnt/gntbox.override
        finch/libgnt/pygnt/gntfilesel.override
        finch/libgnt/pygnt/gntmodule.c
        finch/libgnt/pygnt/gnttree.override
        finch/libgnt/pygnt/gntwidget.override
        finch/libgnt/pygnt/test.py
Added files:
        pidgin/plugins/sendbutton.c
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API autogen.sh finch/gntconv.c
        finch/libgnt/Makefile.am finch/libgnt/gntentry.c
        finch/libgnt/gntmain.c libpurple/account.c libpurple/blist.c
        libpurple/core.c libpurple/dbus-server.h libpurple/log.c
        libpurple/plugin.c libpurple/plugins/perl/Makefile.am
        libpurple/plugins/perl/common/Notify.xs
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/common/Purple.xs
        libpurple/plugins/perl/common/Request.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/perl/perl-handlers.h
        libpurple/plugins/statenotify.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.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/misc.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oft.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/oscar/tlv.c
        libpurple/protocols/oscar/util.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/savedstatuses.c libpurple/win32/giowin32.c
        libpurple/win32/libc_interface.c libpurple/win32/win32dep.c
        libpurple/win32/win32dep.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkmain.c
        pidgin/gtkmenutray.c pidgin/gtksourceundomanager.c
        pidgin/gtkstatusbox.c pidgin/minidialog.c
        pidgin/plugins/Makefile.am pidgin/plugins/perl/Makefile.am
        po/POTFILES.in

ChangeLog: 

merge of 'a2c4bf662d1fdab8c870c1ebbca30968af4bb80a'
     and 'caaa65e1c157e6cb43219237f88a4ad298f3bbf5'