gobjectification: fe55773b: merge of '112344c710303a9d9eb95892b35d69...

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: fe55773b477045d9f41de343a4de132d49c07aee
Ancestor: 112344c710303a9d9eb95892b35d6983db9c85cc
Ancestor: 21320d4c21102b1992258bb1c2c9ad5f32baf682
Author: grim at pidgin.im
Date: 2009-07-19T17:33:07
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/fe55773b477045d9f41de343a4de132d49c07aee

Added files:
        libpurple/gcipher.c libpurple/gcipher.h
        libpurple/sha256cipher.c libpurple/sha256cipher.h
Modified files:
        libpurple/Makefile.am libpurple/account.c libpurple/blist.c
        libpurple/cipher.c libpurple/gsignal.h libpurple/md5cipher.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c libpurple/sha1cipher.c
        libpurple/sha1cipher.h

ChangeLog: 

merge of '112344c710303a9d9eb95892b35d6983db9c85cc'
     and '21320d4c21102b1992258bb1c2c9ad5f32baf682'