dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #12409: make sure action tooltips are escaped when used as markup.

This commit is contained in:
Jehan 2024-11-22 16:37:51 +09:00
parent 121762d9b3
commit 01d8d2680f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/widgets/gimpaction.c
View File

@ -1422,9 +1422,10 @@ gimp_action_update_proxy_tooltip (GimpAction *action,
GimpActionPrivate *priv;
const gchar *tooltip;
const gchar *help_id;
const gchar *reason = NULL;
gchar *escaped_reason = NULL;
gchar *markup = NULL;
const gchar *reason = NULL;
gchar *escaped_tooltip = NULL;
gchar *escaped_reason = NULL;
gchar *markup = NULL;
g_return_if_fail (GIMP_IS_ACTION (action));
@ -1433,14 +1434,14 @@ gimp_action_update_proxy_tooltip (GimpAction *action,
help_id = gimp_action_get_help_id (action);
gimp_action_get_sensitive (action, &reason);
if (reason)
escaped_reason = g_markup_escape_text (reason, -1);
escaped_reason = reason ? g_markup_escape_text (reason, -1) : NULL;
escaped_tooltip = tooltip ? g_markup_escape_text (tooltip, -1) : NULL;
if (tooltip || escaped_reason)
if (escaped_tooltip || escaped_reason)
markup = g_strdup_printf ("%s%s" /* Action tooltip */
"<i><span weight='light'>%s</span></i>", /* Inactive reason */
tooltip ? tooltip : "",
tooltip && escaped_reason ? "\n" : "",
escaped_tooltip ? escaped_tooltip : "",
escaped_tooltip && escaped_reason ? "\n" : "",
escaped_reason ? escaped_reason : "");
/* This hack makes sure we don't replace the tooltips of GimpButtons
@ -1463,6 +1464,7 @@ gimp_action_update_proxy_tooltip (GimpAction *action,
gimp_help_set_help_data_with_markup (list->data, markup, help_id);
}
g_free (escaped_tooltip);
g_free (escaped_reason);
g_free (markup);
}

6
app/widgets/gimpeditor.c
View File

@ -698,7 +698,7 @@ gimp_editor_add_action_button (GimpEditor *editor,
gtk_button_set_relief (GTK_BUTTON (button), button_relief);
icon_name = gimp_action_get_icon_name (action);
tooltip = g_strdup (gimp_action_get_tooltip (action));
tooltip = g_markup_escape_text (gimp_action_get_tooltip (action), -1);
help_id = g_object_get_qdata (G_OBJECT (action), GIMP_HELP_ID);
old_child = gtk_bin_get_child (GTK_BIN (button));
@ -738,7 +738,7 @@ gimp_editor_add_action_button (GimpEditor *editor,
if (tooltip)
{
const gchar *ext_tooltip = gimp_action_get_tooltip (action);
gchar *ext_tooltip = g_markup_escape_text (gimp_action_get_tooltip (action), -1);
if (ext_tooltip)
{
@ -747,6 +747,8 @@ gimp_editor_add_action_button (GimpEditor *editor,
"</b> ", ext_tooltip, NULL);
g_free (tooltip);
tooltip = tmp;
g_free (ext_tooltip);
}
}
}