# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1235014911 0
# Node ID b93f3d152de698eda53eb1080aa38aeeeff66144
# Parent  4ea0f3edd973c8de928a8470b968bf04909df7d6# Parent  bb43dea906234be20ffc28bd28e6c87a489d4966
merge of '3cf23371e3e019d9e8de26e38bab170c5ed4aca1'
     and 'cee63f93d8c1fdcf74c596d5958b744aa0638042'

diff -r 4ea0f3edd973 -r b93f3d152de6 libpurple/plugin.h
--- a/libpurple/plugin.h	Thu Feb 19 02:32:42 2009 +0000
+++ b/libpurple/plugin.h	Thu Feb 19 03:41:51 2009 +0000
@@ -34,11 +34,16 @@
 #include "signals.h"
 #include "value.h"
 
+/** @copydoc _PurplePlugin */
 typedef struct _PurplePlugin           PurplePlugin;
+/** @copydoc _PurplePluginInfo */
 typedef struct _PurplePluginInfo       PurplePluginInfo;
+/** @copydoc _PurplePluginUiInfo */
 typedef struct _PurplePluginUiInfo     PurplePluginUiInfo;
+/** @copydoc _PurplePluginLoaderInfo */
 typedef struct _PurplePluginLoaderInfo PurplePluginLoaderInfo;
 
+/** @copydoc _PurplePluginAction */
 typedef struct _PurplePluginAction     PurplePluginAction;
 
 typedef int PurplePluginPriority; /**< Plugin priority. */
diff -r 4ea0f3edd973 -r b93f3d152de6 libpurple/prefs.h
--- a/libpurple/prefs.h	Thu Feb 19 02:32:42 2009 +0000
+++ b/libpurple/prefs.h	Thu Feb 19 03:41:51 2009 +0000
@@ -30,17 +30,17 @@
 #include <glib.h>
 
 /**
- * Pref data types.
+ * Preference data types.
  */
 typedef enum _PurplePrefType
 {
-	PURPLE_PREF_NONE,
-	PURPLE_PREF_BOOLEAN,
-	PURPLE_PREF_INT,
-	PURPLE_PREF_STRING,
-	PURPLE_PREF_STRING_LIST,
-	PURPLE_PREF_PATH,
-	PURPLE_PREF_PATH_LIST
+	PURPLE_PREF_NONE,        /**< No type.         */
+	PURPLE_PREF_BOOLEAN,     /**< Boolean.         */
+	PURPLE_PREF_INT,         /**< Integer.         */
+	PURPLE_PREF_STRING,      /**< String.          */
+	PURPLE_PREF_STRING_LIST, /**< List of strings. */
+	PURPLE_PREF_PATH,        /**< Path.            */
+	PURPLE_PREF_PATH_LIST    /**< List of paths.   */
 
 } PurplePrefType;
 
diff -r 4ea0f3edd973 -r b93f3d152de6 libpurple/sslconn.h
--- a/libpurple/sslconn.h	Thu Feb 19 02:32:42 2009 +0000
+++ b/libpurple/sslconn.h	Thu Feb 19 03:41:51 2009 +0000
@@ -39,6 +39,7 @@
 
 #define PURPLE_SSL_DEFAULT_PORT 443
 
+/** @copydoc _PurpleSslConnection */
 typedef struct _PurpleSslConnection PurpleSslConnection;
 
 typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *,
diff -r 4ea0f3edd973 -r b93f3d152de6 libpurple/version.h.in
--- a/libpurple/version.h.in	Thu Feb 19 02:32:42 2009 +0000
+++ b/libpurple/version.h.in	Thu Feb 19 03:41:51 2009 +0000
@@ -24,8 +24,11 @@
 #ifndef _PURPLE_VERSION_H_
 #define _PURPLE_VERSION_H_
 
+/** The major version of the running libpurple. */
 #define PURPLE_MAJOR_VERSION (@PURPLE_MAJOR_VERSION@)
+/** The minor version of the running libpurple. */
 #define PURPLE_MINOR_VERSION (@PURPLE_MINOR_VERSION@)
+/** The micro version of the running libpurple. */
 #define PURPLE_MICRO_VERSION (@PURPLE_MICRO_VERSION@)
 
 #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \
diff -r 4ea0f3edd973 -r b93f3d152de6 pidgin/gtkblist.h
--- a/pidgin/gtkblist.h	Thu Feb 19 02:32:42 2009 +0000
+++ b/pidgin/gtkblist.h	Thu Feb 19 03:41:51 2009 +0000
@@ -27,6 +27,7 @@
 #ifndef _PIDGINBLIST_H_
 #define _PIDGINBLIST_H_
 
+/** @copydoc _PidginBuddyList */
 typedef struct _PidginBuddyList PidginBuddyList;
 
 enum {
diff -r 4ea0f3edd973 -r b93f3d152de6 pidgin/plugins/pidgininc.c