diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pango-layout.c | 8 |
8 files changed, 49 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 4073a309..9d83c7db 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4073a309..9d83c7db 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 4073a309..9d83c7db 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 4073a309..9d83c7db 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 4073a309..9d83c7db 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 4073a309..9d83c7db 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +2000-11-13 Elliot Lee <sopwith@redhat.com> + + Patches from long ago: + * pango/pango-layout.c: Make pango_layout slightly more robust. + Do check_lines before getting cursor position. + 2000-11-13 Havoc Pennington <hp@redhat.com> * docs/pango-sections.txt: Add new PangoLayoutIter entry points diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 0b928a24..3d6594b4 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -808,6 +808,7 @@ PangoLayoutLine * pango_layout_get_line (PangoLayout *layout, int line) { + GSList *list_item; g_return_val_if_fail (layout != NULL, NULL); g_return_val_if_fail (line >= 0, NULL); @@ -815,7 +816,10 @@ pango_layout_get_line (PangoLayout *layout, return NULL; pango_layout_check_lines (layout); - return g_slist_nth (layout->lines, line)->data; + list_item = g_slist_nth (layout->lines, line); + if(list_item) + return list_item->data; + return NULL; } /** @@ -1411,6 +1415,8 @@ pango_layout_get_cursor_pos (PangoLayout *layout, base_dir = pango_context_get_base_dir (layout->context); + pango_layout_check_lines (layout); + iter = pango_layout_get_iter (layout); /* Find the line */ |