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

Merge branch 'picture-nullable-setters' into 'master'

Browse Source 
picture: Make setters actually take NULL

Closes #3974

See merge request GNOME/gtk!3598
This commit is contained in:
Matthias Clasen
2021-05-26 11:46:23 +00:00
parent cbe2aa716d 8f4b0cd30d
commit c0ca3c642a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkpicture.c
View File

@@ -586,7 +586,11 @@ gtk_picture_set_file (GtkPicture *self,
g_set_object (&self->file, file);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FILE]);
paintable = gdk_paintable_new_from_file_scaled (file, gtk_widget_get_scale_factor (GTK_WIDGET (self)));
if (file)
paintable = gdk_paintable_new_from_file_scaled (file, gtk_widget_get_scale_factor (GTK_WIDGET (self)));
else
paintable = NULL;
gtk_picture_set_paintable (self, paintable);
g_clear_object (&paintable);