# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1173059905 0
# Node ID 52ee22ba2cd270092e82411fcfc2f87270367e1c
# Parent  2ed235b0f97eed468d0e3656176040055940deb3# Parent  f1e4121dcb1ede599b9b4d8365aff42e2634254d
merge of '8d1175446aba95222f38c31207ca29c492f9d0fb'
     and 'd59e830c02b5909e91b567258fca78dc9af8e282'

diff -r 2ed235b0f97e -r 52ee22ba2cd2 console/libgnt/gnttextview.c
--- a/console/libgnt/gnttextview.c	Sun Mar 04 16:52:25 2007 +0000
+++ b/console/libgnt/gnttextview.c	Mon Mar 05 01:58:25 2007 +0000
@@ -204,9 +204,9 @@
 	do {
 		line = lines->data;
 		lines = lines->next;
-	} while (line && !line->segments);
+	} while (line && !line->segments && lines);
 
-	if (!line) /* no valid line */
+	if (!line || !line->segments) /* no valid line */
 		return NULL;
 	segs = line->segments;
 	seg = (GntTextSegment *)segs->data;
diff -r 2ed235b0f97e -r 52ee22ba2cd2 console/libgnt/test/tv.c
--- a/console/libgnt/test/tv.c	Sun Mar 04 16:52:25 2007 +0000
+++ b/console/libgnt/test/tv.c	Mon Mar 05 01:58:25 2007 +0000
@@ -83,6 +83,7 @@
 	gnt_entry_set_history_length(GNT_ENTRY(entry), -1);
 	g_signal_connect_after(G_OBJECT(entry), "key_pressed", G_CALLBACK(key_pressed), view);
 
+	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(view), "\n", GNT_TEXT_FLAG_NORMAL);
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(view), "plugins: ", GNT_TEXT_FLAG_BOLD);
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(view), "this is the 1st line\n", GNT_TEXT_FLAG_NORMAL);
 
diff -r 2ed235b0f97e -r 52ee22ba2cd2 console/libgnt/wms/s.c
--- a/console/libgnt/wms/s.c	Sun Mar 04 16:52:25 2007 +0000
+++ b/console/libgnt/wms/s.c	Mon Mar 05 01:58:25 2007 +0000
@@ -182,7 +182,7 @@
 	text = gnt_get_clipboard_string();
 	clip = gnt_hwindow_new(FALSE);
 	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
-	GNT_WIDGET_UNSET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
+	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
 	gnt_box_set_pad(GNT_BOX(clip), 0);
 	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
 	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text));