Mercurial > pidgin.yaz
changeset 23211:bda7c7c4d4b2
merge of 'c6ab942a565a274680983552ced9a21feb5f24a9'
and 'f7d017b07571640c01e4ebb88a33ceb638a133bb'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Mon, 26 May 2008 20:51:10 +0000 |
| parents | 1cc810daf355 (current diff) d3fb9d9b57e2 (diff) |
| children | 1e87376e77f2 |
| files | |
| diffstat | 2 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/buddyicon.h Mon May 26 20:03:40 2008 +0000 +++ b/libpurple/buddyicon.h Mon May 26 20:51:10 2008 +0000 @@ -26,6 +26,11 @@ #ifndef _PURPLE_BUDDYICON_H_ #define _PURPLE_BUDDYICON_H_ +/** An opaque structure representing a buddy icon for a particular user on a + * particular #PurpleAccount. Instances are reference-counted; use + * purple_buddy_icon_ref() and purple_buddy_icon_unref() to take and release + * references. + */ typedef struct _PurpleBuddyIcon PurpleBuddyIcon; #include "account.h"
--- a/libpurple/prpl.h Mon May 26 20:03:40 2008 +0000 +++ b/libpurple/prpl.h Mon May 26 20:51:10 2008 +0000 @@ -71,16 +71,22 @@ #include "status.h" #include "whiteboard.h" + +/** @copydoc PurpleBuddyIconSpec */ struct _PurpleBuddyIconSpec { - char *format; /**< This is a comma-delimited list of image formats or NULL if icons are not supported. - * Neither the core nor the prpl will actually check to see if the data it's given matches this; it's - * entirely up to the UI to do what it wants */ - int min_width; /**< The minimum width of this icon */ - int min_height; /**< The minimum height of this icon */ - int max_width; /**< The maximum width of this icon */ - int max_height; /**< The maximum height of this icon */ - size_t max_filesize; /**< The maximum number of bytes */ - PurpleIconScaleRules scale_rules; /**< How to stretch this icon */ + /** This is a comma-delimited list of image formats or @c NULL if icons + * are not supported. Neither the core nor the prpl will actually + * check to see if the data it's given matches this; it's entirely up + * to the UI to do what it wants + */ + char *format; + + int min_width; /**< Minimum width of this icon */ + int min_height; /**< Minimum height of this icon */ + int max_width; /**< Maximum width of this icon */ + int max_height; /**< Maximum height of this icon */ + size_t max_filesize; /**< Maximum size in bytes */ + PurpleIconScaleRules scale_rules; /**< How to stretch this icon */ }; struct proto_chat_entry {