--- a/libpurple/buddyicon.c Wed Apr 25 22:24:15 2007 +0000 +++ b/libpurple/buddyicon.c Wed Apr 25 23:29:46 2007 +0000 @@ -443,10 +443,12 @@ icon->img = NULL; if (data != NULL) + { if (len > 0) icon->img = purple_buddy_icon_data_new(data, len, NULL); else g_free(data); + } icon->checksum = g_strdup(checksum); @@ -696,8 +698,7 @@ } else { - // TODO - // purple_account_remove_setting(account, "buddy_icon"); + purple_account_set_string(account, "buddy_icon", NULL); } unref_filename(old_icon); @@ -964,9 +965,6 @@ PurpleBlistNode *node = purple_blist_get_root(); const char *dirname = purple_buddy_icons_get_cache_dir(); - // TODO: TEMP - //old_icons_dir = g_strdup("/home/rlaager/.gaim/icons"); - /* Doing this once here saves having to check it inside a loop. */ if (old_icons_dir != NULL) {