Mercurial > pidgin
changeset 17793:deb00aacc93c
merge of '03ea20ce538dad585a5a2d40778f242a1fd85a4b'
and '04e67ab53da79e8268e027ed9b4423c64c6b86ee'
author | William Ehlhardt <williamehlhardt@gmail.com> |
---|---|
date | Thu, 31 May 2007 00:40:46 +0000 |
parents | 393cf111f366 (diff) 3ce170204ef0 (current diff) |
children | f7bf776d628a |
files | libpurple/plugins/ssl/ssl-gnutls.c |
diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/cipher.c Thu May 31 00:39:01 2007 +0000 +++ b/libpurple/cipher.c Thu May 31 00:40:46 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 */ }; /******************************************************************************
--- a/libpurple/prefs.h Thu May 31 00:39:01 2007 +0000 +++ b/libpurple/prefs.h Thu May 31 00:40:46 2007 +0000 @@ -55,7 +55,9 @@ #endif /**************************************************************************/ -/** @name Prefs API */ +/** @name Prefs API + Preferences are named according to a directory-like structure. + Example: "/plugins/core/potato/is_from_idaho" (probably a boolean) */ /**************************************************************************/ /*@{*/