adium/adium

4a5092083b6b
Credit Chenguang Li for his patch, changelog the fix. References #15915.

Also some minor reshuffiing of the other changes.
/* libotr headers */
#import <libotr/proto.h>
#import <libotr/context.h>
#import <libotr/message.h>
#import <libotr/privkey.h>