Mercurial > pidgin.yaz
changeset 17469:c52b7911a229
merge of '5628b597c447ec593feebd627ec56ad5304a2533'
and 'fc2e1fa3bc2a17c263570261f4555178330532b7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 30 May 2007 05:35:59 +0000 |
| parents | c8ee24d443c6 (diff) 141ecb693c16 (current diff) |
| children | d4464c354346 92e27556160c |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 30 05:32:49 2007 +0000 +++ b/ChangeLog Wed May 30 05:35:59 2007 +0000 @@ -5,6 +5,7 @@ * Moving an ICQ buddy from one group to another no longer re-requests authorization from that person (Rene Hausleitner) * Added nullprpl, an example protocol plugin (Ryan Barrett) + * Fixed SOCKS5 bug which caused Jabber file receiving to fail Finch: * Auto account reconnecting
--- a/libpurple/cipher.c Wed May 30 05:32:49 2007 +0000 +++ b/libpurple/cipher.c Wed May 30 05:35:59 2007 +0000 @@ -1447,14 +1447,14 @@ * Structs ******************************************************************************/ struct _PurpleCipher { - gchar *name; - PurpleCipherOps *ops; - guint ref; + gchar *name; /**< Internal name - used for searching */ + PurpleCipherOps *ops; /**< Operations supported by this cipher */ + guint ref; /**< Reference count */ }; struct _PurpleCipherContext { - PurpleCipher *cipher; - gpointer data; + PurpleCipher *cipher; /**< Cipher this context is under */ + gpointer data; /**< Internal cipher state data */ }; /******************************************************************************