# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177646671 0
# Node ID e40d216f1368124173427fb4d0d8e18e259f79d3
# Parent  74daf9fc9cf36ce15ca22ada08bf41c707dfafa4# Parent  15f79c0cd0b93f590a6e6d46901c26f5fa5a1f02
merge of '723918ad23d423582cf7442116a810b6a2eb16d4'
     and '74b5097c85b1bba90e2508d4d5a477306a49704e'

diff -r 74daf9fc9cf3 -r e40d216f1368 libpurple/protocols/silc/util.c
--- 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();