pidgin: 3a740826: propagate from branch 'im.pidgin.pidgin....

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 3a7408265d339b20bd3bef7b8fefc62215ccf644
Parent:   218f7cd8f439bacd4fef6897f0389a7cd18ba67d
Parent:   a838619f39988fb46c2305600984725495b15ee1
Author:   datallah at pidgin.im
Date:     08/22/11 12:00:57
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3a7408265d339b20bd3bef7b8fefc62215ccf644

Changelog: 

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 218f7cd8f439bacd4fef6897f0389a7cd18ba67d)
            to branch 'im.pidgin.pidgin' (head a838619f39988fb46c2305600984725495b15ee1)

Changes against parent 218f7cd8f439bacd4fef6897f0389a7cd18ba67d

  dropped  gaim-uninstalled.pc.in
  dropped  gaim.pc.in
  dropped  libpurple/gaim-compat.h
  dropped  libpurple/protocols/silc10
  dropped  libpurple/protocols/silc10/Makefile.am
  dropped  libpurple/protocols/silc10/Makefile.mingw
  dropped  libpurple/protocols/silc10/README
  dropped  libpurple/protocols/silc10/TODO
  dropped  libpurple/protocols/silc10/buddy.c
  dropped  libpurple/protocols/silc10/chat.c
  dropped  libpurple/protocols/silc10/ft.c
  dropped  libpurple/protocols/silc10/ops.c
  dropped  libpurple/protocols/silc10/pk.c
  dropped  libpurple/protocols/silc10/silc.c
  dropped  libpurple/protocols/silc10/silcpurple.h
  dropped  libpurple/protocols/silc10/util.c
  dropped  libpurple/protocols/silc10/wb.c
  dropped  libpurple/protocols/silc10/wb.h
  dropped  libpurple/purple-uninstalled.pc.in
  dropped  libpurple/purple.pc.in
  dropped  pidgin/gtkgaim-compat.h
  dropped  pidgin/pidgin-uninstalled.pc.in
  dropped  pidgin/pidgin.pc.in
  renamed  libpurple/purple-2-uninstalled.pc.in
       to  libpurple/purple-3-uninstalled.pc.in
  renamed  libpurple/purple-2.pc.in
       to  libpurple/purple-3.pc.in
  renamed  pidgin/pidgin-2-uninstalled.pc.in
       to  pidgin/pidgin-3-uninstalled.pc.in
  renamed  pidgin/pidgin-2.pc.in
       to  pidgin/pidgin-3.pc.in
  patched  ChangeLog
  patched  ChangeLog.API
  patched  Makefile.am
  patched  configure.ac
  patched  finch/finch.c
  patched  finch/gntblist.c
  patched  finch/gntconn.c
  patched  finch/gntnotify.c
  patched  finch/gntprefs.c
  patched  finch/libgnt/gntfilesel.h
  patched  finch/libgnt/gntprogressbar.h
  patched  finch/libgnt/gnttree.h
  patched  finch/libgnt/gntwidget.h
  patched  finch/libgnt/gntwm.h
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/blist.c
  patched  libpurple/buddyicon.c
  patched  libpurple/certificate.c
  patched  libpurple/cipher.h
  patched  libpurple/cmds.h
  patched  libpurple/connection.c
  patched  libpurple/connection.h
  patched  libpurple/core.c
  patched  libpurple/core.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/internal.h
  patched  libpurple/notify.c
  patched  libpurple/notify.h
  patched  libpurple/plugins/perl/common/Connection.xs
  patched  libpurple/plugins/perl/common/Notify.xs
  patched  libpurple/plugins/perl/common/Status.xs
  patched  libpurple/plugins/tcl/tcl_cmds.c
  patched  libpurple/pounce.c
  patched  libpurple/prefs.h
  patched  libpurple/privacy.h
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/mdns_types.h
  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/gg/buddylist.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_plain.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/buddy.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/mxit/cipher.h
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/http.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/markup.h
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/mxit/voicevideo.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/authorization.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  libpurple/protocols/oscar/visibility.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/buddy.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/util.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_packet.c
  patched  libpurple/protocols/yahoo/yahoo_profile.c
  patched  libpurple/protocols/yahoo/ycht.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/request.c
  patched  libpurple/request.h
  patched  libpurple/savedstatuses.c
  patched  libpurple/sound.h
  patched  libpurple/status.c
  patched  libpurple/status.h
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  libpurple/xmlnode.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkconn.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdialogs.h
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkmain.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/pidgin-3-uninstalled.pc.in
  patched  pidgin/pidgin-3.pc.in
  patched  pidgin/plugins/perl/common/GtkBlist.xs
  patched  pidgin/plugins/perl/common/GtkDialogs.xs
  patched  pidgin/plugins/relnot.c
  patched  pidgin/win32/untar.h

Changes against parent a838619f39988fb46c2305600984725495b15ee1

  patched  libpurple/protocols/jabber/win32/posix.uname.c