comparison libgaim/buddyicon.c @ 15223:26357b7f117e

[gaim-migrate @ 18012] * Get rid of an assertion failure that I think was happening when you added a new account without setting a custom icon for it, and you still had the Accounts window open * A little code-reuse in some buddy icon scaling code * An minor memleak that could happen when unable open a new file in $HOME/.gaim/icons/ committer: Tailor Script <[e-mail]>

15222:3043806ad900

	g_hash_table_destroy(account_cache);
}

void gaim_buddy_icon_get_scale_size(GaimBuddyIconSpec *spec, int *width, int *height)
{
	if(spec && spec->scale_rules & GAIM_ICON_SCALE_DISPLAY) {
		int new_width, new_height;

		new_width = *width;
		new_height = *height;

		if(*width < spec->min_width)
			new_width = spec->min_width;
		else if(*width > spec->max_width)
			new_width = spec->max_width;

		if(*height < spec->min_height)
			new_height = spec->min_height;
		else if(*height  > spec->max_height)
			new_height = spec->max_height;

		/* preserve aspect ratio */
		if ((double)*height * (double)new_width >
			(double)*width * (double)new_height) {
				new_width = 0.5 + (double)*width * (double)new_height / (double)*height;
		} else {
				new_height = 0.5 + (double)*height * (double)new_width / (double)*width;
		}

		*width = new_width;
		*height = new_height;
	}
}

15223:26357b7f117e

	g_hash_table_destroy(account_cache);
}

void gaim_buddy_icon_get_scale_size(GaimBuddyIconSpec *spec, int *width, int *height)
{
	int new_width, new_height;

	new_width = *width;
	new_height = *height;

	if (*width < spec->min_width)
		new_width = spec->min_width;
	else if (*width > spec->max_width)
		new_width = spec->max_width;

	if (*height < spec->min_height)
		new_height = spec->min_height;
	else if (*height > spec->max_height)
		new_height = spec->max_height;

	/* preserve aspect ratio */
	if ((double)*height * (double)new_width >
		(double)*width * (double)new_height) {
			new_width = 0.5 + (double)*width * (double)new_height / (double)*height;
	} else {
			new_height = 0.5 + (double)*height * (double)new_width / (double)*width;
	}

	*width = new_width;
	*height = new_height;
}