Mercurial > pidgin
diff libpurple/pluginpref.h @ 20877:7dfb2ff2e75c
merge of '03251b6e4e7a7bf736ba0023dfe31a49e89d0f42'
and 'd42511319051bcfa8adb3ed8e3f11a26cabc43f4'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 10 Oct 2007 13:56:54 +0000 |
| parents | 4511d15a8f80 |
| children | 59c9c04879af |
line wrap: on
line diff
--- a/libpurple/pluginpref.h Wed Oct 10 04:11:52 2007 +0000 +++ b/libpurple/pluginpref.h Wed Oct 10 13:56:54 2007 +0000 @@ -35,16 +35,16 @@ */ typedef enum { - PURPLE_STRING_FORMAT_TYPE_NONE = 0, - PURPLE_STRING_FORMAT_TYPE_MULTILINE = 1 << 0, - PURPLE_STRING_FORMAT_TYPE_HTML = 1 << 1 + PURPLE_STRING_FORMAT_TYPE_NONE = 0, /**< The string is plain text. */ + PURPLE_STRING_FORMAT_TYPE_MULTILINE = 1 << 0, /**< The string can have newlines. */ + PURPLE_STRING_FORMAT_TYPE_HTML = 1 << 1 /**< The string can be in HTML. */ } PurpleStringFormatType; typedef enum { PURPLE_PLUGIN_PREF_NONE, PURPLE_PLUGIN_PREF_CHOICE, - PURPLE_PLUGIN_PREF_INFO, /**< no-value label */ - PURPLE_PLUGIN_PREF_STRING_FORMAT + PURPLE_PLUGIN_PREF_INFO, /**< no-value label */ + PURPLE_PLUGIN_PREF_STRING_FORMAT /**< The preference has a string value. */ } PurplePluginPrefType; #include <glib.h>
