Mercurial > pidgin.yaz
comparison libpurple/smiley.h @ 23189:7e0b815d2133
merge of '45401c961ca97b6dd3675db39ca8d46f5142dada'
and '886c30a3d3006c7497f9e6ce6354ba660e5505bd'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 25 May 2008 22:06:51 +0000 |
parents | 013ec6fabd3f |
children | f22ecddd3eba |
comparison
equal
deleted
inserted
replaced
23182:e0bcb8cfda74 | 23189:7e0b815d2133 |
---|---|
126 * old one will be removed. | 126 * old one will be removed. |
127 * | 127 * |
128 * @param smiley The custom smiley. | 128 * @param smiley The custom smiley. |
129 * @param smiley_data The custom smiley data. | 129 * @param smiley_data The custom smiley data. |
130 * @param smiley_data_len The custom smiley data length. | 130 * @param smiley_data_len The custom smiley data length. |
131 * @param keepfilename The current custom smiley's filename must be | |
132 * kept. | |
133 */ | 131 */ |
134 void | 132 void |
135 purple_smiley_set_data(PurpleSmiley *smiley, guchar *smiley_data, | 133 purple_smiley_set_data(PurpleSmiley *smiley, guchar *smiley_data, |
136 size_t smiley_data_len, gboolean keepfilename); | 134 size_t smiley_data_len); |
137 | 135 |
138 /** | 136 /** |
139 * Returns the custom smiley's associated shortcut. | 137 * Returns the custom smiley's associated shortcut. |
140 * | 138 * |
141 * @param smiley The custom smiley. | 139 * @param smiley The custom smiley. |