Mercurial > pidgin
changeset 25495:b93f3d152de6
merge of '3cf23371e3e019d9e8de26e38bab170c5ed4aca1'
and 'cee63f93d8c1fdcf74c596d5958b744aa0638042'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Thu, 19 Feb 2009 03:41:51 +0000 |
| parents | 4ea0f3edd973 (current diff) bb43dea90623 (diff) |
| children | 7d58d7a3c5c3 9fcff08ce726 |
| files | pidgin/plugins/pidgininc.c |
| diffstat | 5 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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. */
--- 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;
--- 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 *,
--- 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 && \