[gimp/gimp-2-10] Revert "app: append insensitive reason to GimpAction proxy tooltip."
- From: Jacob Boerema <jboerema src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] Revert "app: append insensitive reason to GimpAction proxy tooltip."
- Date: Fri, 23 Apr 2021 19:08:13 +0000 (UTC)
commit b93dd4e0fefdbff53a751c45a8fa638444389c04
Author: Jacob Boerema <jgboerema gmail com>
Date: Fri Apr 23 15:07:55 2021 -0400
Revert "app: append insensitive reason to GimpAction proxy tooltip."
This reverts commit bf9a2927234715a04876e176b5dfc9530b20f43e.
I messed up copying the commit to cherry pick.
app/widgets/gimpaction.c | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c
index b96af124a2..88cae45fa0 100644
--- a/app/widgets/gimpaction.c
+++ b/app/widgets/gimpaction.c
@@ -368,30 +368,12 @@ static void
gimp_action_set_proxy_tooltip (GimpAction *action,
GtkWidget *proxy)
{
- const gchar *tooltip;
- const gchar *reason = NULL;
- gchar *escaped_reason = NULL;
- gchar *markup;
-
- tooltip = gimp_action_get_tooltip (action);
-
- gimp_action_get_sensitive (action, &reason);
- if (reason)
- escaped_reason = g_markup_escape_text (reason, -1);
-
- markup = g_strdup_printf ("%s%s" /* Action tooltip */
- "<i><span weight='light'>%s</span></i>", /* Inactive reason */
- tooltip,
- escaped_reason && tooltip ? "\n" : "",
- escaped_reason);
-
- if (tooltip || escaped_reason)
- gimp_help_set_help_data_with_markup (proxy, markup,
- g_object_get_qdata (G_OBJECT (proxy),
- GIMP_HELP_ID));
-
- g_free (escaped_reason);
- g_free (markup);
+ const gchar *tooltip = gimp_action_get_tooltip (action);
+
+ if (tooltip)
+ gimp_help_set_help_data (proxy, tooltip,
+ g_object_get_qdata (G_OBJECT (proxy),
+ GIMP_HELP_ID));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]