pidgin: 948a2413: merge of '0acd4d77f5bd8bb02a3a73b6800be6...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 948a241377181a1828ba5faa1f076e95bf6b95d8
Parent:   0acd4d77f5bd8bb02a3a73b6800be683bd7068f2
Parent:   6bee9aeec299196df3421d8fa5d0c663ae9f9e88
Author:   qulogic at pidgin.im
Date:     09/11/11 22:42:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/948a241377181a1828ba5faa1f076e95bf6b95d8

Changelog: 

merge of '0acd4d77f5bd8bb02a3a73b6800be683bd7068f2'
     and '6bee9aeec299196df3421d8fa5d0c663ae9f9e88'

Changes against parent 0acd4d77f5bd8bb02a3a73b6800be683bd7068f2

  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  ChangeLog.API
  patched  configure.ac
  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/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/mxit.c
  patched  libpurple/protocols/myspace/myspace.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.am
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtklog.c
  patched  pidgin/gtklog.h
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkthemes.c
  patched  pidgin/gtkthemes.h
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/history.c
  patched  pidgin/plugins/notify.c

Changes against parent 6bee9aeec299196df3421d8fa5d0c663ae9f9e88

  patched  libpurple/protocols/yahoo/yahoo_picture.c