Mercurial > pidgin.yaz
comparison pidgin/gtksmiley.h @ 32779:d72f2f13b60f
merge of 'c8c73eea7431e6f940916315ace40a41c8da3faa'
and 'fec428131bde0ae8247941bd6a3d996c984c9189'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Fri, 21 Oct 2011 14:36:18 +0000 |
parents | 02a2e8183b1d |
children |
comparison
equal
deleted
inserted
replaced
32778:14787acaf9d7 | 32779:d72f2f13b60f |
---|---|
1 /** | 1 /** |
2 * @file gtksmiley.h GTK+ Custom Smiley API | 2 * @file gtksmiley.h GTK+ Custom Smiley API |
3 * @ingroup pidgin | 3 * @ingroup pidgin |
4 * @since 2.5.0 | |
5 */ | 4 */ |
6 | 5 |
7 /* pidgin | 6 /* pidgin |
8 * | 7 * |
9 * Pidgin is the legal property of its developers, whose names are too numerous | 8 * Pidgin is the legal property of its developers, whose names are too numerous |
104 * Sets the image data in a smiley add dialog | 103 * Sets the image data in a smiley add dialog |
105 * | 104 * |
106 * @param editor A smiley editor dialog | 105 * @param editor A smiley editor dialog |
107 * @param data A pointer to smiley's data | 106 * @param data A pointer to smiley's data |
108 * @param datasize The size of smiley's data | 107 * @param datasize The size of smiley's data |
109 * | |
110 * @since 2.6.0 | |
111 */ | 108 */ |
112 void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize); | 109 void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize); |
113 | 110 |
114 #endif /* PIDGIN_GTKSMILEY_H */ | 111 #endif /* PIDGIN_GTKSMILEY_H */ |