Revision bf946fc60b7489fdf6bea3ba83f91f9008e77d9e

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: bf946fc60b7489fdf6bea3ba83f91f9008e77d9e
Ancestor: 2344c84a6e70c374b19936a127462d2f19c0139c
Ancestor: f2eb358baf2c72cb37b6b9bcb4c036e44e0bcc2b
Author: khc at pidgin.im
Date: 2007-06-19T17:17:57
Branch: im.pidgin.pidgin

Added files:
        finch/plugins/pietray.py
Modified files:
        ChangeLog.API configure.ac finch/gntaccount.c finch/gntft.c
        finch/gntpounce.c finch/gntprefs.c finch/gntrequest.c
        finch/gntstatus.c finch/libgnt/gnttree.c
        finch/libgnt/gnttree.h finch/libgnt/gntwm.h
        finch/libgnt/wms/irssi.c finch/libgnt/wms/s.c
        finch/plugins/Makefile.am libpurple/account.c
        libpurple/account.h libpurple/accountopt.c
        libpurple/accountopt.h libpurple/blist.c
        libpurple/buddyicon.c libpurple/connection.c
        libpurple/connection.h libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c
        libpurple/dbus-analyze-functions.py
        libpurple/dbus-bindings.h libpurple/dbus-server.c
        libpurple/dbus-useful.c libpurple/idle.c
        libpurple/internal.h libpurple/log.c libpurple/mime.c
        libpurple/mime.h libpurple/notify.c libpurple/notify.h
        libpurple/plugins/joinpart.c
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/AccountOpts.xs
        libpurple/plugins/perl/common/Connection.xs
        libpurple/plugins/perl/common/Conversation.xs
        libpurple/plugins/perl/common/Notify.xs
        libpurple/plugins/perl/common/Request.xs
        libpurple/plugins/perl/common/SavedStatuses.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/plugins/startup.py
        libpurple/plugins/tcl/tcl_cmds.c libpurple/pounce.c
        libpurple/pounce.h libpurple/prefs.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/packet_parse.h
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/yahoochat.h
        libpurple/protocols/zephyr/ZLocations.c libpurple/prpl.c
        libpurple/request.c libpurple/request.h
        libpurple/savedstatuses.c libpurple/savedstatuses.h
        libpurple/status.c libpurple/status.h libpurple/util.c
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkdocklet.c pidgin/gtkft.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtklog.c pidgin/gtkmain.c pidgin/gtkpounce.c
        pidgin/gtkrequest.c pidgin/gtkroomlist.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c
        pidgin/gtkthemes.c pidgin/gtkutils.c pidgin/gtkutils.h
        pidgin/plugins/gestures/gestures.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/notify.c pidgin/plugins/spellchk.c
        pidgin/plugins/timestamp.c pidgin/plugins/xmppconsole.c
Modified attrs:
        finch/plugins/pietray.py

ChangeLog: 

explicit merge of 'f2eb358baf2c72cb37b6b9bcb4c036e44e0bcc2b'
              and '2344c84a6e70c374b19936a127462d2f19c0139c'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from bf946fc60b7489fdf6bea3ba83f91f9008e77d9e