Mercurial > pidgin.yaz

changeset 7779:de9a47ff006a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8424] copy plain text. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Sat, 06 Dec 2003 21:55:22 +0000
parents 3db18c16f573
children 7ab3d01d2c50
files src/gtkimhtml.c
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkimhtml.c	Sat Dec 06 21:32:20 2003 +0000
+++ b/src/gtkimhtml.c	Sat Dec 06 21:55:22 2003 +0000
@@ -361,13 +361,15 @@
 	GtkTextIter start, end;
 	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
 	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
+	char *text;
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
+	
 
-	char *text = gtk_imhtml_get_markup_range(imhtml, &start, &end);
 	if (info == TARGET_HTML) {
 		int len;
 		GString *str = g_string_new(NULL);
+		text = gtk_imhtml_get_markup_range(imhtml, &start, &end);
 		
 		/* Mozilla asks that we start our text/html with the Unicode byte order mark */
 		str = g_string_append_unichar(str, 0xfeff);
@@ -376,11 +378,12 @@
 		char *selection = g_convert(str->str, str->len, "UCS-2", "UTF-8", NULL, &len, NULL);
 		gtk_selection_data_set (selection_data, gdk_atom_intern("text/html", FALSE), 16, selection, len);
 		g_string_free(str, TRUE);
-		g_free(text);
 		g_free(selection);
 	} else {
+		text = gtk_text_buffer_get_text(imhtml, &start, &end, FALSE);
 		gtk_selection_data_set_text(selection_data, text, strlen(text));
 	}
+	g_free(text);
 }
 
 static void gtk_imhtml_clipboard_clear(GtkClipboard *clipboard, GtkIMHtml *imhtml)
@@ -2519,10 +2522,9 @@
 					//espan = sspan;
 					//gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &eiter, espan->end);
 					closers = g_list_insert_sorted(closers, sspan, (GCompareFunc)span_compare_end);
-					if (closers->data != espan) {
-						espan = (GtkIMHtmlFormatSpan*)closers->data;
-						gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &eiter, espan->end);
-					}
+					espan = (GtkIMHtmlFormatSpan*)closers->data;
+					gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &eiter, espan->end);
+					
 				}
 				starters = starters->next;
 				if (starters) {