Mercurial > pidgin.yaz
comparison libpurple/value.h @ 16492:915a56e08a9d
merge of 'b40bd1885046f301b11610cd406822e5d32968f7'
and 'c160ad5b1979376c855bd74321ba7bfac438181f'
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Mon, 23 Apr 2007 00:52:51 +0000 |
parents | 391a79778f89 |
children | 602295db8e6b |
comparison
equal
deleted
inserted
replaced
16477:ac9d28bba272 | 16492:915a56e08a9d |
---|---|
74 PURPLE_SUBTYPE_STATUS, | 74 PURPLE_SUBTYPE_STATUS, |
75 PURPLE_SUBTYPE_LOG, | 75 PURPLE_SUBTYPE_LOG, |
76 PURPLE_SUBTYPE_XFER, | 76 PURPLE_SUBTYPE_XFER, |
77 PURPLE_SUBTYPE_SAVEDSTATUS, | 77 PURPLE_SUBTYPE_SAVEDSTATUS, |
78 PURPLE_SUBTYPE_XMLNODE, | 78 PURPLE_SUBTYPE_XMLNODE, |
79 PURPLE_SUBTYPE_USERINFO | 79 PURPLE_SUBTYPE_USERINFO, |
80 PURPLE_SUBTYPE_STORED_IMAGE | |
80 } PurpleSubType; | 81 } PurpleSubType; |
81 | 82 |
82 /** | 83 /** |
83 * A wrapper for a type, subtype, and specific type of value. | 84 * A wrapper for a type, subtype, and specific type of value. |
84 */ | 85 */ |