pidgin: 03b17bf5: merge of '36b528cbf13e606208f74b6ec90ce9...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 03b17bf5507ba0bb453f0561e3ae54f7d2a64272
Parent:   36b528cbf13e606208f74b6ec90ce973f512df75
Parent:   95bdb96951c9aaae802bf85e057270a6a37d2ca8
Author:   darkrain42 at pidgin.im
Date:     08/30/10 22:57:59
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/03b17bf5507ba0bb453f0561e3ae54f7d2a64272

Changelog: 

merge of '36b528cbf13e606208f74b6ec90ce973f512df75'
     and '95bdb96951c9aaae802bf85e057270a6a37d2ca8'

Changes against parent 36b528cbf13e606208f74b6ec90ce973f512df75

  dropped  pidgin/pixmaps/emotes/small/16/cool.png
  dropped  pidgin/pixmaps/emotes/small/16/grin.png
  dropped  pidgin/win32/IdleTracker
  dropped  pidgin/win32/IdleTracker/Makefile.mingw
  dropped  pidgin/win32/IdleTracker/idletrack.c
  dropped  pidgin/win32/IdleTracker/idletrack.h
  added    pidgin/pixmaps/emotes/small/16/glasses-cool.png
  added    pidgin/pixmaps/emotes/small/16/thunder.png
  patched  ChangeLog
  patched  libpurple/request.c
  patched  libpurple/win32/global.mak
  patched  libpurple/win32/targets.mak
  patched  libpurple/win32/win32dep.c
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkidle.c
  patched  pidgin/pixmaps/emotes/default/24/default.theme.in
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  patched  pidgin/pixmaps/emotes/small/16/small.theme.in
  patched  pidgin/win32/gtkwin32dep.c
  patched  pidgin/win32/gtkwin32dep.h
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  pidgin/win32/winpidgin.c
  patched  pidgin/win32/wspell.c
  attr on  pidgin/pixmaps/emotes/small/16/glasses-cool.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/thunder.png
      set  mtn:manual_merge
       to  true

Changes against parent 95bdb96951c9aaae802bf85e057270a6a37d2ca8

  patched  ChangeLog
  patched  libpurple/account.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/libxmpp.c
  patched  libpurple/protocols/jabber/parser.c