diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-06-14 18:14:25 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-06-14 18:14:25 +0000 |
| commit | d5cfc65fc0aae159982e5da8965b85bfd6eb9d66 (patch) | |
| tree | f983fc91a1db5eb8d05a9959c8aae40df4688150 /src/ui/widget | |
| parent | Merge branch 'undefined' of gitlab.com:sileGit/inkscape (diff) | |
| parent | Fix three more instances of incorrectly escaped markup (diff) | |
| download | inkscape-d5cfc65fc0aae159982e5da8965b85bfd6eb9d66.tar.gz inkscape-d5cfc65fc0aae159982e5da8965b85bfd6eb9d66.zip | |
Merge branch 'fontmarkup' of gitlab.com:darktrojan/inkscape
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/font-selector.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp index 70f7d55db..59b7311c2 100644 --- a/src/ui/widget/font-selector.cpp +++ b/src/ui/widget/font-selector.cpp @@ -12,6 +12,7 @@ #endif #include <glibmm/i18n.h> +#include <glibmm/markup.h> #include "font-selector.h" @@ -268,8 +269,8 @@ FontSelector::style_cell_data_func (Gtk::CellRenderer *renderer, Gtk::TreeIter c Glib::ustring style = "Normal"; (*iter).get_value(1, style); - Glib::ustring style_escaped = Glib::strescape( style ); - Glib::ustring font_desc = family + " " + style; + Glib::ustring style_escaped = Glib::Markup::escape_text( style ); + Glib::ustring font_desc = Glib::Markup::escape_text( family + " " + style ); Glib::ustring markup; markup = "<span font='" + font_desc + "'>" + style_escaped + "</span>"; |