mirror of
https://github.com/davatorium/rofi.git
synced 2025-03-03 16:05:20 -05:00
Merge remote-tracking branch 'origin/master' into glib-loop
This commit is contained in:
commit
f7e2632624
2 changed files with 6 additions and 1 deletions
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Add table
Reference in a new issue