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

Merge branch 'builder-leaks' into 'master'

Browse Source 
builder: Don't leak refs

See merge request GNOME/gtk!4001
This commit is contained in:
Matthias Clasen
2021-09-27 23:16:29 +00:00
parent 1b82de1797 e3ecd5d23e
commit 69cf1aa050
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkbuilder.c
View File

@@ -606,16 +606,17 @@ gtk_builder_get_parameters (GtkBuilder *builder,
continue;
}
if (prop->pspec->flags & filter_flags)
{
if (filtered_parameters)
object_properties_add (filtered_parameters, property_name, &property_value);
}
/* At this point, property_value has been set, and we need to either
* copy it to one of the two arrays, or unset it.
*/
g_assert (G_IS_VALUE (&property_value));
if ((prop->pspec->flags & filter_flags) != 0 && filtered_parameters)
object_properties_add (filtered_parameters, property_name, &property_value);
else if ((prop->pspec->flags & filter_flags) == 0 && parameters)
object_properties_add (parameters, property_name, &property_value);
else
{
if (parameters)
object_properties_add (parameters, property_name, &property_value);
}
g_value_unset (&property_value);
}
}

3
gtk/gtkcoloreditor.c
View File

@@ -447,9 +447,6 @@ gtk_color_editor_dispose (GObject *object)
dismiss_current_popup (editor);
g_clear_object (&editor->picker);
g_clear_object (&editor->h_adj);
g_clear_object (&editor->s_adj);
g_clear_object (&editor->v_adj);
G_OBJECT_CLASS (gtk_color_editor_parent_class)->dispose (object);
}