gobjectification: 98f563bf: merge of '19adaafca695167a05ff56529f9293...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 98f563bf0a5f798721a77d82364e10c2d9683eb9
Parent:   19adaafca695167a05ff56529f9293f8f3ed453e
Parent:   9406d1412dbd8fb4db2598f87cfce408daf2ce17
Author:   qulogic at pidgin.im
Date:     07/08/10 20:29:27
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/98f563bf0a5f798721a77d82364e10c2d9683eb9

Changelog: 

merge of '19adaafca695167a05ff56529f9293f8f3ed453e'
     and '9406d1412dbd8fb4db2598f87cfce408daf2ce17'

Changes against parent 19adaafca695167a05ff56529f9293f8f3ed453e

  renamed  libpurple/cipher.c
       to  libpurple/cipher/cipher.c
  renamed  libpurple/cipher.h
       to  libpurple/cipher/cipher.h
  renamed  libpurple/des3cipher.c
       to  libpurple/cipher/des3cipher.c
  renamed  libpurple/des3cipher.h
       to  libpurple/cipher/des3cipher.h
  renamed  libpurple/descipher.c
       to  libpurple/cipher/descipher.c
  renamed  libpurple/descipher.h
       to  libpurple/cipher/descipher.h
  renamed  libpurple/ghash.c
       to  libpurple/cipher/ghash.c
  renamed  libpurple/ghash.h
       to  libpurple/cipher/ghash.h
  renamed  libpurple/hash.c
       to  libpurple/cipher/hash.c
  renamed  libpurple/hash.h
       to  libpurple/cipher/hash.h
  renamed  libpurple/hmaccipher.c
       to  libpurple/cipher/hmaccipher.c
  renamed  libpurple/hmaccipher.h
       to  libpurple/cipher/hmaccipher.h
  renamed  libpurple/md4hash.c
       to  libpurple/cipher/md4hash.c
  renamed  libpurple/md4hash.h
       to  libpurple/cipher/md4hash.h
  renamed  libpurple/md5cipher.c
       to  libpurple/cipher/md5cipher.c
  renamed  libpurple/md5cipher.h
       to  libpurple/cipher/md5cipher.h
  renamed  libpurple/rc4cipher.c
       to  libpurple/cipher/rc4cipher.c
  renamed  libpurple/rc4cipher.h
       to  libpurple/cipher/rc4cipher.h
  renamed  libpurple/sha1cipher.c
       to  libpurple/cipher/sha1cipher.c
  renamed  libpurple/sha1cipher.h
       to  libpurple/cipher/sha1cipher.h
  renamed  libpurple/sha256cipher.c
       to  libpurple/cipher/sha256cipher.c
  renamed  libpurple/sha256cipher.h
       to  libpurple/cipher/sha256cipher.h
  added    libpurple/cipher
  patched  libpurple/Makefile.am
  patched  libpurple/cipher/cipher.c
  patched  libpurple/cipher/des3cipher.h
  patched  libpurple/cipher/descipher.h
  patched  libpurple/cipher/ghash.h
  patched  libpurple/cipher/hmaccipher.h
  patched  libpurple/cipher/md4hash.h
  patched  libpurple/cipher/md5cipher.h
  patched  libpurple/cipher/rc4cipher.h
  patched  libpurple/cipher/sha1cipher.h
  patched  libpurple/cipher/sha256cipher.h
  patched  libpurple/ntlm.c
  patched  libpurple/plugins/ciphertest.c
  patched  libpurple/plugins/perl/common/BuddyList.xs
  patched  libpurple/plugins/perl/common/module.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth_digest_md5.c
  patched  libpurple/protocols/jabber/auth_scram.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/caps.h
  patched  libpurple/protocols/jabber/jutil.c
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/myspace/myspace.h
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_auth.c
  patched  libpurple/protocols/oscar/family_oservice.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/qq/qq_base.c
  patched  libpurple/protocols/qq/qq_network.c
  patched  libpurple/protocols/qq/qq_process.c
  patched  libpurple/protocols/qq/utils.c
  patched  libpurple/protocols/simple/simple.h
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_doodle.c
  patched  libpurple/proxy.c
  patched  libpurple/util.c

Changes against parent 9406d1412dbd8fb4db2598f87cfce408daf2ce17

  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  Makefile.am
  patched  configure.ac
  patched  doc/finch.1.in
  patched  finch/finch.c
  patched  finch/gntaccount.c
  patched  finch/gntdebug.c
  patched  finch/gntrequest.c
  patched  finch/gntsound.c
  patched  finch/libgnt/configure.ac
  patched  finch/libgnt/gntbox.c
  patched  finch/libgnt/gntcombobox.c
  patched  finch/libgnt/gntentry.c
  patched  finch/libgnt/gnttree.c
  patched  finch/libgnt/gnttree.h
  patched  finch/libgnt/gntutils.c
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/blist.c
  patched  libpurple/certificate.c
  patched  libpurple/connection.c
  patched  libpurple/core.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/plugins/Makefile.mingw
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/irc/cmds.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/data.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jutil.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/namespaces.h
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/util.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/tests/test_jabber_scram.c
  patched  libpurple/tests/test_util.c
  patched  libpurple/util.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/plugins/Makefile.mingw
  patched  po/sv.po