this patch adds nullprpl, a mock protocol plugin, to the libpurple/protocols

Updated comment.

Fixed smiley theme chooser label.

merge of '320dce1497adf175e6dcdd0839607a8cd3ee7052'

propagate from branch 'im.pidgin.pidgin' (head e1ee9b15c4c105489848430395fbcb2aa9fe4c51)

fix socks5 from over-reading the headers, and throwing away data (fixes jabber file receiving)

Credit for the ICQ authorization re-request fix

Clean up some other ssi-related things. This commit and my last one

Cleanup and simplification of some tlvlist stuff in the oscar protocol.

merge of '6150355a25a7fa21b84f423c16e0e605b6782ad7' soc.2007.certmgr

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip

mercurial