diff options
| author | Dave Davenport <qball@gmpclient.org> | 2016-02-09 19:55:31 +0100 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2016-02-09 19:55:31 +0100 |
| commit | f7e26326249a485cdeac82581a3d79fadac2e29e (patch) | |
| tree | 11391ddfc44f6d666e9f8dd39866d5e42ce4811f /source | |
| parent | c3f15a4e2aab70a3638ee3f3c934ccb7a27d92de (diff) | |
| parent | 5185f1181c9ec9d98a0edf85cb9ad5d08948ef06 (diff) | |
Merge remote-tracking branch 'origin/master' into glib-loop
Diffstat (limited to 'source')
| -rw-r--r-- | source/dialogs/dmenu.c | 5 | ||||
| -rw-r--r-- | source/textbox.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c index 1d3f56fe..cd2e789d 100644 --- a/source/dialogs/dmenu.c +++ b/source/dialogs/dmenu.c @@ -87,6 +87,11 @@ static char **get_dmenu ( FILE *fd, unsigned int *length ) } if ( data[l - 1] == config.separator ) { data[l - 1] = '\0'; + l--; + } + if ( ! g_utf8_validate ( data, l, NULL) ) { + fprintf(stderr, "String: '%s' is not valid utf-8\n", data); + continue; } retv[( *length )] = data; diff --git a/source/textbox.c b/source/textbox.c index b6ec7fc0..e207c7f4 100644 --- a/source/textbox.c +++ b/source/textbox.c @@ -159,7 +159,7 @@ static void __textbox_update_pango_text ( textbox *tb ) pango_layout_set_attributes ( tb->layout, NULL ); pango_layout_set_text ( tb->layout, string, l ); } - else if ( tb->tbft & MARKUP ) { + else if ( tb->flags & TB_MARKUP || tb->tbft & MARKUP ) { pango_layout_set_markup ( tb->layout, tb->text, -1 ); } else { |