cpw.masca.webkit, im.pidgin.pidgin: bb41d065: propagate from branch 'im.pidgin.pidgin'...

[masca at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: bb41d065e7ff1100b5eb50335111df9b50537753
Parent:   b476d9d3a50b2c2c895471c6dd6231384749ff92
Parent:   e6d5f823c4caa7144f24e6c71090dcf9b87528b0
Author:   masca at cpw.pidgin.im
Date:     09/07/11 01:44:17
Branch:   im.pidgin.cpw.masca.webkit
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bb41d065e7ff1100b5eb50335111df9b50537753

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head e6d5f823c4caa7144f24e6c71090dcf9b87528b0)
            to branch 'im.pidgin.cpw.masca.webkit' (head b476d9d3a50b2c2c895471c6dd6231384749ff92)

Changes against parent b476d9d3a50b2c2c895471c6dd6231384749ff92

  patched  ChangeLog.API
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/dbus-analyze-functions.py
  patched  libpurple/plugins/perl/common/BuddyList.xs
  patched  libpurple/plugins/perl/common/Conversation.xs
  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/libxmpp.c
  patched  libpurple/protocols/msn/msn.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/sametime/sametime.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.h
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdocklet.c

Changes against parent e6d5f823c4caa7144f24e6c71090dcf9b87528b0

  added    pidgin/plugins/adiumthemes
  added    pidgin/gtkwebview.c
  added    pidgin/gtkwebview.h
  added    pidgin/plugins/adiumthemes/Makefile.am
  added    pidgin/plugins/adiumthemes/Template.html
  added    pidgin/plugins/adiumthemes/message-style.c
  added    pidgin/plugins/adiumthemes/message-style.h
  added    pidgin/plugins/adiumthemes/webkit.c
  added    pidgin/smileyparser.c
  added    pidgin/smileyparser.h
  patched  configure.ac
  patched  pidgin/Makefile.am
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtklog.c
  patched  pidgin/gtklog.h
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkthemes.c
  patched  pidgin/gtkthemes.h
  patched  pidgin/plugins/Makefile.am