Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

entry: Avoid recursion in gtk_entry_ensure_layout

Browse Source 
This was unintentional, and lead to a memory leak.
This commit is contained in:
Matthias Clasen
2016-11-14 15:18:25 -05:00
parent a28022e916
commit 9a257e1f6a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkentry.c
View File

@@ -7485,6 +7485,7 @@ gtk_entry_set_buffer (GtkEntry *entry,
{
GtkEntryPrivate *priv;
GObject *obj;
gboolean had_buffer = FALSE;
g_return_if_fail (GTK_IS_ENTRY (entry));
@@ -7498,6 +7499,7 @@ gtk_entry_set_buffer (GtkEntry *entry,
if (priv->buffer)
{
had_buffer = TRUE;
buffer_disconnect_signals (entry);
g_object_unref (priv->buffer);
}
@@ -7518,8 +7520,11 @@ gtk_entry_set_buffer (GtkEntry *entry,
g_object_notify_by_pspec (obj, entry_props[PROP_INVISIBLE_CHAR_SET]);
g_object_thaw_notify (obj);
gtk_editable_set_position (GTK_EDITABLE (entry), 0);
gtk_entry_recompute (entry);
if (had_buffer)
{
gtk_editable_set_position (GTK_EDITABLE (entry), 0);
gtk_entry_recompute (entry);
}
}
/**