Mercurial > pidgin.yaz
changeset 17506:fa33879e3a0a
merge of '4b282994660451b15a8a393ef032d32e9bf00d2e'
and 'cca063073007b0d29e6e6aaf1b9df55926035009'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Thu, 31 May 2007 00:40:09 +0000 |
| parents | 69e0551deebe (diff) 52ba21acc168 (current diff) |
| children | b610b8e0c850 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/cipher.c Thu May 31 00:37:10 2007 +0000 +++ b/libpurple/cipher.c Thu May 31 00:40:09 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:37:10 2007 +0000 +++ b/libpurple/prefs.h Thu May 31 00:40:09 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) */ /**************************************************************************/ /*@{*/