From 80dae4f3000a16a89672c8b408e221f22717b8fc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 2 Jan 2001 21:43:35 +0000 Subject: [PATCH] Fix unitialized variable when moving back onto a single line. Tue Jan 2 16:23:05 2001 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_previous_line): Fix unitialized variable when moving back onto a single line. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktextlayout.c | 10 ++-------- 8 files changed, 44 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 337ecea524..1e2aeb61da 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Jan 2 16:23:05 2001 Owen Taylor + + * gtk/gtktextlayout.c + (gtk_text_layout_move_iter_to_previous_line): Fix unitialized + variable when moving back onto a single line. + 2001-01-01 Havoc Pennington * gtk/Makefile.am (LDFLAGS): add @LIBTOOL_EXPORT_OPTIONS@ diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 71c610ef40..b95a66c54b 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2424,14 +2424,8 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout, { gtk_text_layout_free_line_display (layout, display); display = gtk_text_layout_get_line_display (layout, prev_line, FALSE); - - tmp_list = pango_layout_get_lines (display->layout); - - while (tmp_list->next) - { - layout_line = tmp_list->data; - tmp_list = tmp_list->next; - } + tmp_list = g_slist_last (pango_layout_get_lines (display->layout)); + layout_line = tmp_list->data; line_display_index_to_iter (layout, display, iter, layout_line->start_index + layout_line->length, 0); -- GitLab