Mercurial > pidgin3 / file diff

--- a/libpurple/image-store.c	Thu Apr 10 00:32:00 2014 +0200
+++ b/libpurple/image-store.c	Thu Apr 10 00:43:24 2014 +0200
@@ -26,7 +26,7 @@
 
 #define TEMP_IMAGE_TIMEOUT 5
 
-static GHashTable *id_to_image;
+static GHashTable *id_to_image = NULL;
 static guint last_id = 0;
 
 /* keys: timeout handle */
@@ -35,6 +35,14 @@
 /* keys: img id */
 static GSList *perm_images = NULL;
 
+static void
+image_reset_id(gpointer _id)
+{
+	g_return_if_fail(id_to_image != NULL);
+
+	g_hash_table_remove(id_to_image, _id);
+}
+
 static guint
 image_set_id(PurpleImage *image)
 {
@@ -52,10 +60,9 @@
 			break;
 	}
 
-	g_object_set_data(G_OBJECT(image), "purple-image-store-id",
-		GINT_TO_POINTER(last_id));
+	g_object_set_data_full(G_OBJECT(image), "purple-image-store-id",
+		GINT_TO_POINTER(last_id), image_reset_id);
 	g_hash_table_insert(id_to_image, GINT_TO_POINTER(last_id), image);
-	/* TODO: hook map removal after object destruction */
 	return last_id;
 }