Mercurial > pidgin

changeset 574:0aca48e1baa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 584] smileys wrap more properly now committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Tue, 01 Aug 2000 23:50:32 +0000
parents 9566a53cde23
children a33616e4e48d
files ChangeLog src/gtkhtml.c
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 01 23:25:23 2000 +0000
+++ b/ChangeLog	Tue Aug 01 23:50:32 2000 +0000
@@ -3,7 +3,10 @@
 version 0.10.0: 
 	* New Smiley Faces and Pixmaps added.
 	* Smiley faces now properly wrap in the conversation windows.
+	* Smiley dialog
 	* Fixed 0-byte file segfault.
+	* Borderless buttons (for that cool pop-up look)
+	* Fixed resizing bugs
 	
 version 0.9.20 (07/14/2000):
 	* More plugin events, more plugin features
--- a/src/gtkhtml.c	Tue Aug 01 23:25:23 2000 +0000
+++ b/src/gtkhtml.c	Tue Aug 01 23:50:32 2000 +0000
@@ -2700,14 +2700,9 @@
 
 	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;
 	}