# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1180572023 0
# Node ID b610b8e0c850c9e9e7ba3aa35c1d349063933369
# Parent  7b23e93dfe22d6200b8e10de00263fde39761821# Parent  fa33879e3a0a5e02a8777031ecb3ed8aa03262d0
merge of '4538f6c33c0f8ed2d8e1f9124fb52bce0d676e63'
     and 'c41f4a042c7fd12301b7a3acdf8d766cbb4fc8ea'

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