callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkEntryAccessible: also handle entry icon tooltip NULL in notify_gtk.

Browse Source 
To clear the tooltip one is to set the tooltip to NULL. Though
the GtkEntryAccessible expect this tooltip to not be NULL in
gtk_entry_accessible_notify_gtk (already handling this case
 in its _init).

Fixes:
** (epiphany:23914): CRITICAL **: atk_object_set_description: assertion
`description != NULL' failed
when epiphany g_object_set the entry icon tooltip to NULL (clear the
tooltip) in its find bar.

https://bugzilla.gnome.org/show_bug.cgi?id=695375
This commit is contained in:
Alban Browaeys
2013-03-07 15:54:04 +01:00
committed by Matthias Clasen
parent 8e65fa1b43
commit da961b7ab8
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/a11y/gtkentryaccessible.c
View File

@ -572,9 +572,17 @@ gtk_entry_accessible_notify_gtk (GObject *obj,
gchar *text; gchar *text;
text = gtk_entry_get_icon_tooltip_text (gtk_entry, text = gtk_entry_get_icon_tooltip_text (gtk_entry,
GTK_ENTRY_ICON_PRIMARY); GTK_ENTRY_ICON_PRIMARY);
atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY], if (text)
{
atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
text); text);
g_free (text); g_free (text);
}
else
{
atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
"");
}
} }
} }
else if (g_strcmp0 (pspec->name, "secondary-icon-tooltip-text") == 0) else if (g_strcmp0 (pspec->name, "secondary-icon-tooltip-text") == 0)
@ -584,9 +592,17 @@ gtk_entry_accessible_notify_gtk (GObject *obj,
gchar *text; gchar *text;
text = gtk_entry_get_icon_tooltip_text (gtk_entry, text = gtk_entry_get_icon_tooltip_text (gtk_entry,
GTK_ENTRY_ICON_SECONDARY); GTK_ENTRY_ICON_SECONDARY);
atk_object_set_description (priv->icons[GTK_ENTRY_ICON_SECONDARY], if (text)
{
atk_object_set_description (priv->icons[GTK_ENTRY_ICON_SECONDARY],
text); text);
g_free (text); g_free (text);
}
else
{
atk_object_set_description (priv->icons[GTK_ENTRY_ICON_PRIMARY],
"");
}
} }
} }
else if (g_strcmp0 (pspec->name, "primary-icon-activatable") == 0) else if (g_strcmp0 (pspec->name, "primary-icon-activatable") == 0)