diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-11-01 23:37:28 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-11-01 23:37:28 +0000 |
| commit | 3ef9bb08b0b8ea7b36089d90a6d091f7e3f32307 (patch) | |
| tree | fce1f6e2d033a4424f1b0a817f7dc95089edb10a | |
| parent | 944d744a867f9b612cacf83605514a8a926933d1 (diff) | |
| download | pango-3ef9bb08b0b8ea7b36089d90a6d091f7e3f32307.tar.gz | |
Fix bug where not all text was appended when parsing accelerators
2000-11-01 Havoc Pennington <hp@redhat.com>
* pango/pango-markup.c (text_handler): Fix bug where not all text
was appended when parsing accelerators
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/pango-markup.c | 15 |
8 files changed, 57 insertions, 7 deletions
@@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index ab4c2b03..d8918893 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ab4c2b03..d8918893 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index ab4c2b03..d8918893 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ab4c2b03..d8918893 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ab4c2b03..d8918893 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ab4c2b03..d8918893 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,4 +1,9 @@ -2000-11-01 +2000-11-01 Havoc Pennington <hp@redhat.com> + + * pango/pango-markup.c (text_handler): Fix bug where not all text + was appended when parsing accelerators + +2000-11-01 Pablo Saratxaga <pablo@mandrakesoft.com> * modules/thai/thai.c: added aliases for X11 font names used on Solaris diff --git a/pango/pango-markup.c b/pango/pango-markup.c index 2ae6dcbc..6be17320 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -511,6 +511,21 @@ text_handler (GMarkupParseContext *context, p = g_utf8_next_char (p); } + if (range_end) + { + g_string_append_len (md->text, + range_start, + range_end - range_start); + md->index += range_end - range_start; + } + else + { + g_string_append_len (md->text, + range_start, + end - range_start); + md->index += end - range_start; + } + if (md->attr_list != NULL && uline_index >= 0) { /* Add the underline indicating the accelerator */ |