[gnome-applets] window-title: generate valid markup

[Alberts Muktupāvels <muktupavels src gnome org>]

commit aeaef6433f1b4e34fdf674033183232331fc7e7b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 10 20:19:52 2020 +0200

    window-title: generate valid markup
    
    https://gitlab.gnome.org/GNOME/gnome-applets/issues/5

 window-title/windowtitle.c | 22 ++++++++++++++++------
 window-title/windowtitle.h |  1 -
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/window-title/windowtitle.c b/window-title/windowtitle.c
index e6f340f98..31f4e5439 100755
--- a/window-title/windowtitle.c
+++ b/window-title/windowtitle.c
@@ -250,7 +250,8 @@ static void
 updateTitle (WTApplet *wtapplet)
 {
        WnckWindow *controlledwindow;
-       gchar *title_text, *title_color, *title_font;
+       const char *title_text, *title_color, *title_font;
+       GString *markup;
        GdkPixbuf *icon_pixbuf;
 
        if (wtapplet->prefs->only_maximized) {
@@ -275,7 +276,7 @@ updateTitle (WTApplet *wtapplet)
                }
        } else {
                icon_pixbuf = wnck_window_get_icon(controlledwindow); // This only returns a pointer - it 
SHOULDN'T be unrefed!
-               title_text = (gchar*)wnck_window_get_name(controlledwindow);
+               title_text = wnck_window_get_name(controlledwindow);
        }
 
        // TODO: we need the default font to somehow be the same in both modes
@@ -294,7 +295,7 @@ updateTitle (WTApplet *wtapplet)
                // automatic (non-custom) style
                if (controlledwindow == wtapplet->activewindow) {
                        // window focused
-                       title_color = wtapplet->panel_color_fg;
+                       title_color = "";
                        title_font = "";
                } else {
                        // window unfocused
@@ -309,10 +310,19 @@ updateTitle (WTApplet *wtapplet)
                gtk_widget_set_tooltip_text (GTK_WIDGET(wtapplet->title), title_text);
        }
 
-       title_text = g_markup_printf_escaped("<span font=\"%s\" color=\"%s\">%s</span>", title_font, 
title_color, title_text);
+       markup = g_string_new ("<span");
+
+       if (title_font != NULL && *title_font != '\0')
+               g_string_append_printf (markup, " font=\"%s\"", title_font);
+
+       if (title_color != NULL && *title_color != '\0')
+               g_string_append_printf (markup, " color=\"%s\"", title_color);
+
+       g_string_append_printf (markup, ">%s</span>", title_text);
+
        // Apply markup to label widget
-       gtk_label_set_markup(GTK_LABEL(wtapplet->title), title_text);
-       g_free(title_text);
+       gtk_label_set_markup(GTK_LABEL(wtapplet->title), markup->str);
+       g_string_free (markup, TRUE);
 
        if (icon_pixbuf == NULL) {
                gtk_image_clear(wtapplet->icon);
diff --git a/window-title/windowtitle.h b/window-title/windowtitle.h
index 3b5562c27..4d0df059a 100755
--- a/window-title/windowtitle.h
+++ b/window-title/windowtitle.h
@@ -132,7 +132,6 @@ typedef struct {
                                        umaxed_handler_name,    // umaxedwindow's manechange event handler ID
                                        umaxed_handler_icon;    // umaxedwindow's iconchange event handler ID
        gboolean                focused;                                // [T/F] Window state (focused or 
unfocused)
-       gchar                   *panel_color_fg;                // Foreground color determined by the panel
 
        GdkPixbufRotation       angle;                          // Applet angle
        PanelAppletOrient       orient;                         // Panel orientation