Mercurial > pidgin
changeset 17792:393cf111f366
merge of 'b30d119437548516a2f7b28d4172f8fcd6238d10'
and 'd7da32c69fe39372cde96fb7c4b454b673c75ea7'
author | William Ehlhardt <williamehlhardt@gmail.com> |
---|---|
date | Thu, 31 May 2007 00:40:36 +0000 |
parents | b610b8e0c850 (diff) 15550eab4e27 (current diff) |
children | deb00aacc93c |
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:38:18 2007 +0000 +++ b/libpurple/cipher.c Thu May 31 00:40:36 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:38:18 2007 +0000 +++ b/libpurple/prefs.h Thu May 31 00:40:36 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) */ /**************************************************************************/ /*@{*/