soc.2010.detachablepurple: 3c5661ce: merge of '30a5d7b5d78ab6e0a42b6f352d5171...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 3c5661ceacbf49d2ea5bbaae524a9231196f0acb
Parent:   30a5d7b5d78ab6e0a42b6f352d51712257dfb4b6
Parent:   c46f30ffc5a3a722ca9f7d399a0cabb68b5967fa
Author:   gillux at soc.pidgin.im
Date:     07/28/10 19:53:11
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/3c5661ceacbf49d2ea5bbaae524a9231196f0acb

Changelog: 

merge of '30a5d7b5d78ab6e0a42b6f352d51712257dfb4b6'
     and 'c46f30ffc5a3a722ca9f7d399a0cabb68b5967fa'

Changes against parent 30a5d7b5d78ab6e0a42b6f352d51712257dfb4b6

  added    libpurple/dbus-callback.c
  added    libpurple/dbus-callback.h
  added    libpurple/dbus-prototypes/callback.xml
  patched  libpurple/Makefile.am
  patched  libpurple/account-dbus.c
  patched  libpurple/account-dbus.h
  patched  libpurple/account.c
  patched  libpurple/core.c
  patched  libpurple/dbus-prototypes/account.xml
  patched  libpurple/dbus-purple.h
  patched  libpurple/dbus-server.c
  patched  libpurple/marshallers.list
  patched  libpurple/pobject.c
  patched  libpurple/pobject.h
  patched  libpurple/protocols/bonjour/Makefile.am
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.am
  patched  libpurple/protocols/myspace/Makefile.am
  patched  libpurple/protocols/novell/Makefile.am
  patched  libpurple/protocols/null/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/qq/Makefile.am
  patched  libpurple/protocols/sametime/Makefile.am
  patched  libpurple/protocols/silc/Makefile.am
  patched  libpurple/protocols/silc10/Makefile.am
  patched  libpurple/protocols/simple/Makefile.am
  patched  libpurple/protocols/yahoo/Makefile.am
  patched  libpurple/protocols/zephyr/Makefile.am

Changes against parent c46f30ffc5a3a722ca9f7d399a0cabb68b5967fa

  patched  finch/gntblist.c
  patched  finch/gntconv.c
  patched  finch/gntconv.h
  patched  finch/gntpounce.c
  patched  finch/gntsound.c
  patched  finch/plugins/gntgf.c
  patched  finch/plugins/lastlog.c
  patched  libpurple/blist.c
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/example/nullclient.c
  patched  libpurple/idle.c
  patched  libpurple/plugins/idle.c
  patched  libpurple/plugins/signals-test.c
  patched  libpurple/plugins/statenotify.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/server.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtksound.c
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/cap/cap.c
  patched  pidgin/plugins/gevolution/gevolution.c
  patched  pidgin/plugins/mailchk.c
  patched  pidgin/plugins/musicmessaging/musicmessaging.c
  patched  pidgin/plugins/pidgininc.c
  patched  pidgin/plugins/relnot.c
  patched  pidgin/plugins/ticker/ticker.c
  patched  pidgin/plugins/xmppconsole.c