Improve memory management

This commit is contained in:
Přemysl Eric Janouch 2021-11-23 17:12:31 +01:00
parent 7ab1a6d246
commit fee901a590
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 4 additions and 5 deletions

View File

@ -73,8 +73,7 @@ static void
entry_free(Entry *self)
{
g_free(self->filename);
if (self->thumbnail)
cairo_surface_destroy(self->thumbnail);
g_clear_pointer(&self->thumbnail, cairo_surface_destroy);
g_clear_object(&self->icon);
}
@ -349,8 +348,7 @@ entry_add_thumbnail(gpointer data, gpointer user_data)
{
Entry *self = data;
g_clear_object(&self->icon);
if (self->thumbnail)
cairo_surface_destroy(self->thumbnail);
g_clear_pointer(&self->thumbnail, cairo_surface_destroy);
FastivBrowser *browser = FASTIV_BROWSER(user_data);
self->thumbnail = rescale_thumbnail(

View File

@ -425,7 +425,7 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
switch (event->keyval) {
case GDK_KEY_Escape:
case GDK_KEY_q:
gtk_main_quit();
gtk_widget_destroy(g.window);
return TRUE;
case GDK_KEY_o:
@ -598,6 +598,7 @@ main(int argc, char *argv[])
gtk_css_provider_load_from_data(provider, style, strlen(style), NULL);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref(provider);
g.view_scroller = gtk_scrolled_window_new(NULL, NULL);
g.view = g_object_new(FASTIV_TYPE_VIEW, NULL);