Mercurial > pidgin
changeset 16493:e40d216f1368
merge of '723918ad23d423582cf7442116a810b6a2eb16d4'
and '74b5097c85b1bba90e2508d4d5a477306a49704e'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 27 Apr 2007 04:04:31 +0000 |
| parents | 74daf9fc9cf3 (current diff) 15f79c0cd0b9 (diff) |
| children | 901dd46db686 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/silc/util.c Fri Apr 27 04:03:04 2007 +0000 +++ b/libpurple/protocols/silc/util.c Fri Apr 27 04:04:31 2007 +0000 @@ -676,9 +676,9 @@ } id = g_datalist_get_data(&attribs, "id"); - if (id && (image = purple_imgstore_get(atoi(id)))) { + if (id && (image = purple_imgstore_find_by_id(atoi(id)))) { unsigned long imglen = purple_imgstore_get_size(image); - gpointer img = purple_imgstore_get_data(image); + gconstpointer img = purple_imgstore_get_data(image); p = silc_mime_alloc();