pidgin: 86d223f1: merge of '9912972220e43702dfc027a7d3b30d...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 86d223f1adde65a288482e38d8bb504777b1f486
Parent:   9912972220e43702dfc027a7d3b30db1697ed746
Parent:   e70b24cc167f4cda5898dce940d4fdaad4fb63b3
Author:   qulogic at pidgin.im
Date:     09/25/11 16:22:44
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/86d223f1adde65a288482e38d8bb504777b1f486

Changelog: 

merge of '9912972220e43702dfc027a7d3b30db1697ed746'
     and 'e70b24cc167f4cda5898dce940d4fdaad4fb63b3'

Changes against parent 9912972220e43702dfc027a7d3b30db1697ed746

  patched  pidgin/gtkconv.c

Changes against parent e70b24cc167f4cda5898dce940d4fdaad4fb63b3

  patched  ChangeLog.API
  patched  doc/account-signals.dox
  patched  doc/blist-signals.dox
  patched  doc/connection-signals.dox
  patched  doc/conversation-signals.dox
  patched  doc/gtkconv-signals.dox
  patched  doc/notify-signals.dox
  patched  finch/gntaccount.h
  patched  finch/gntblist.h
  patched  finch/gntft.c
  patched  finch/gntrequest.h
  patched  finch/gntsound.h
  patched  finch/plugins/gnttinyurl.c
  patched  libpurple/account.h
  patched  libpurple/blist.h
  patched  libpurple/certificate.h
  patched  libpurple/cmds.h
  patched  libpurple/connection.h
  patched  libpurple/conversation.h
  patched  libpurple/core.h
  patched  libpurple/dbus-server.h
  patched  libpurple/debug.c
  patched  libpurple/debug.h
  patched  libpurple/eventloop.h
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/log.h
  patched  libpurple/media/backend-fs2.h
  patched  libpurple/media/backend-iface.h
  patched  libpurple/media/candidate.h
  patched  libpurple/media/codec.h
  patched  libpurple/media/enum-types.h
  patched  libpurple/media-gst.h
  patched  libpurple/media.h
  patched  libpurple/mediamanager.h
  patched  libpurple/network.c
  patched  libpurple/network.h
  patched  libpurple/notify.h
  patched  libpurple/plugin.h
  patched  libpurple/plugins/perl/common/FT.xs
  patched  libpurple/plugins/perl/common/Network.xs
  patched  libpurple/plugins/perl/common/Util.xs
  patched  libpurple/pounce.h
  patched  libpurple/prefs.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/dcc_send.c
  patched  libpurple/protocols/jabber/google/relay.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/presence.h
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/jabber/useravatar.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_aliases.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/yahoo/yahoo_picture.c
  patched  libpurple/protocols/yahoo/yahoo_profile.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.h
  patched  libpurple/purple.h.in
  patched  libpurple/request.h
  patched  libpurple/roomlist.h
  patched  libpurple/smiley.h
  patched  libpurple/sslconn.h
  patched  libpurple/stun.c
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  libpurple/version.h.in
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkft.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkimhtmltoolbar.h
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkprefs.h
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtksmiley.h
  patched  pidgin/gtksound.h
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkthemes.h
  patched  pidgin/gtkutils.h
  patched  pidgin/pidgintooltip.h
  patched  pidgin/plugins/relnot.c