Mercurial > pidgin.yaz
changeset 17507:b610b8e0c850
merge of '4538f6c33c0f8ed2d8e1f9124fb52bce0d676e63'
and 'c41f4a042c7fd12301b7a3acdf8d766cbb4fc8ea'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Thu, 31 May 2007 00:40:23 +0000 |
| parents | 7b23e93dfe22 (current diff) fa33879e3a0a (diff) |
| children | 393cf111f366 |
| 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:37:50 2007 +0000 +++ b/libpurple/cipher.c Thu May 31 00:40:23 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:50 2007 +0000 +++ b/libpurple/prefs.h Thu May 31 00:40:23 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) */ /**************************************************************************/ /*@{*/