Mercurial > pidgin.yaz

changeset 8429:1b6c43246cf6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9159] Luke's bug. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Thu, 11 Mar 2004 20:50:15 +0000
parents 018406bb4ab6
children 87bd4d4ff499
files src/gtkimhtml.c
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Thu Mar 11 20:18:38 2004 +0000
+++ b/src/gtkimhtml.c	Thu Mar 11 20:50:15 2004 +0000
@@ -2703,7 +2703,7 @@
 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
 	GtkTextIter iter;
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, ins);
-	if (color) { //!imhtml->edit.forecolor) {
+	if (color) {
 		span = g_malloc(sizeof(GtkIMHtmlFormatSpan));
 		span->start = gtk_text_buffer_create_mark(imhtml->text_buffer, NULL, &iter, TRUE);
 		span->start_tag = g_strdup_printf("<font color=\"%s\">", color);
@@ -2729,7 +2729,7 @@
 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
 	GtkTextIter iter;
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, ins);
-	if (color) { //!imhtml->edit.backcolor) {
+	if (color) {
 		span = g_malloc(sizeof(GtkIMHtmlFormatSpan));
 		span->start = gtk_text_buffer_create_mark(imhtml->text_buffer, NULL, &iter, TRUE);
 		span->start_tag = g_strdup_printf("<font back=\"%s\">", color);
@@ -2753,7 +2753,7 @@
 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
 	GtkTextIter iter;
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, ins);
-	if (face) { //!imhtml->edit.fontface) {
+	if (face) {
 		span = g_malloc(sizeof(GtkIMHtmlFormatSpan));
 		span->start = gtk_text_buffer_create_mark(imhtml->text_buffer, NULL, &iter, TRUE);
 		span->start_tag = g_strdup_printf("<font face=\"%s\">", face);
@@ -2868,7 +2868,7 @@
 	gtk_text_buffer_get_end_iter(imhtml->text_buffer, &siter);
 	eiter = siter;
 
-	if (starters) {
+ 	if (starters) {
 		while (starters) {
 			GtkTextIter tagend;
 			sspan = (GtkIMHtmlFormatSpan*)starters->data;
@@ -2923,7 +2923,10 @@
 					gtk_text_buffer_get_end_iter(imhtml->text_buffer, &eiter);
 				} else {
 					espan = (GtkIMHtmlFormatSpan*)closers->data;
-					gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &eiter, espan->end);
+					if (espan->end)
+						gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &eiter, espan->end);
+					else 
+						gtk_text_iter_forward_to_end(&eiter);
 				}
 			}
 			while (gtk_text_iter_equal(&siter, &iter)) {