comparison src/gtkhtml.c @ 540:f586c3819574

[gaim-migrate @ 550] smileys don't get overwritten committer: Tailor Script <[e-mail]>

539:73d054b7096e

	last_hb = (GtkHtmlBit *) g_list_last(html->html_bits)->data;

	/* make sure pixmaps drop down a line after a <BR> */
	if (last_hb->newline)
		html->current_y += private->height + 2;

	/* wrap pixmaps */
	gdk_window_get_size(html->html_area, &width, &height);
	if ((html->current_x + private->width) >= width) {
		html->current_y += private->height + 2;
		html->current_x = 0;
	}
			
	hb->fit = fit;
	hb->x = html->current_x;

	hb->newline = newline;
	hb->pm = pm;

	if (html->current_x == BORDER_WIDTH)
	{
		html->current_y += hb->height;
		hb->y += hb->height;
	}


	html->current_x += hb->width;

		h = (GtkHtmlBit *) hbits->data;
		h->newline++;
		if (html->current_x > 0)
			html->current_x = 0;
		else
			html->current_y += cfont->ascent + cfont->descent + 2;
		return;
	}

	}


	if (html->current_x == 0)
	{
		html->current_y += height;
		gdk_text_extents(cfont, text, 1, &lb, NULL, NULL, NULL, NULL);
		html->current_x += (2 - lb);
	}
	else if ((hbits = g_list_last(html->html_bits)) != NULL)
	{

540:f586c3819574

	last_hb = (GtkHtmlBit *) g_list_last(html->html_bits)->data;

	/* make sure pixmaps drop down a line after a <BR> */
	if (last_hb->newline)
		html->current_y += private->height + 5;

	/* wrap pixmaps */
	gdk_window_get_size(html->html_area, &width, &height);
	if ((html->current_x + private->width) >= width) {
		html->current_y += private->height + 5;
		html->current_x = 0;
	}
			
	hb->fit = fit;
	hb->x = html->current_x;

	hb->newline = newline;
	hb->pm = pm;

	if (html->current_x == BORDER_WIDTH)
	{
		html->current_y += hb->height + 3;
		hb->y += hb->height + 3;
	}


	html->current_x += hb->width;

		h = (GtkHtmlBit *) hbits->data;
		h->newline++;
		if (html->current_x > 0)
			html->current_x = 0;
		else
			html->current_y += cfont->ascent + cfont->descent + 5;
		return;
	}

	}


	if (html->current_x == 0)
	{
		html->current_y += height + 3;
		gdk_text_extents(cfont, text, 1, &lb, NULL, NULL, NULL, NULL);
		html->current_x += (2 - lb);
	}
	else if ((hbits = g_list_last(html->html_bits)) != NULL)
	{