# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1180572036 0
# Node ID 393cf111f36667f58669e79bad2adf31874407b3
# Parent  b610b8e0c850c9e9e7ba3aa35c1d349063933369# Parent  15550eab4e27d9747199104c719a40f011eb4ed4
merge of 'b30d119437548516a2f7b28d4172f8fcd6238d10'
     and 'd7da32c69fe39372cde96fb7c4b454b673c75ea7'

diff -r 15550eab4e27 -r 393cf111f366 libpurple/cipher.c
--- 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 */
 };
 
 /******************************************************************************
diff -r 15550eab4e27 -r 393cf111f366 libpurple/plugins/ssl/ssl-gnutls.c
diff -r 15550eab4e27 -r 393cf111f366 libpurple/prefs.h
--- 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)    */
 /**************************************************************************/
 /*@{*/