pidgin: bc0376c8: merge of '5c4e09621b978c0972fd440fd215b7...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: bc0376c8790c1b7246ed6e14d44874b64dffab7b
Parent:   5c4e09621b978c0972fd440fd215b775a926e26d
Parent:   dc01d13c59e6c7a6352cd4c3c6bf679f095e00fe
Author:   qulogic at pidgin.im
Date:     09/06/11 14:30:50
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bc0376c8790c1b7246ed6e14d44874b64dffab7b

Changelog: 

merge of '5c4e09621b978c0972fd440fd215b775a926e26d'
     and 'dc01d13c59e6c7a6352cd4c3c6bf679f095e00fe'

Changes against parent 5c4e09621b978c0972fd440fd215b775a926e26d

  patched  libpurple/dbus-analyze-functions.py
  patched  libpurple/util.c
  patched  libpurple/util.h

Changes against parent dc01d13c59e6c7a6352cd4c3c6bf679f095e00fe

  dropped  pidgin/gtkdocklet-gtk.c
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  finch/gntblist.c
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/buddyicon.c
  patched  libpurple/buddyicon.h
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/imgstore.h
  patched  libpurple/network.c
  patched  libpurple/plugin.c
  patched  libpurple/plugin.h
  patched  libpurple/plugins/perl/common/Account.xs
  patched  libpurple/plugins/perl/common/BuddyList.xs
  patched  libpurple/plugins/perl/common/Conversation.xs
  patched  libpurple/plugins/perl/common/Status.xs
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/jingleinfo.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/libxmpp.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/jabber/roster.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/null/nullprpl.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/buddy.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/silcpurple.h
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.c
  patched  libpurple/prpl.h
  patched  libpurple/server.c
  patched  libpurple/server.h
  patched  libpurple/status.c
  patched  libpurple/status.h
  patched  libpurple/stun.c
  patched  libpurple/tests/test_xmlnode.c
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h
  patched  pidgin/Makefile.am
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtkdocklet.h
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/plugins/perl/common/GtkIMHtml.xs