diff options
| author | lukefromdc <[email protected]> | 2018-04-05 22:12:40 -0400 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2018-04-06 13:50:50 -0400 |
| commit | a00bad28d88e1af9f8290192ec90287a42f736ef (patch) | |
| tree | fe653466fedb61295dae1d81a6b74e0189da026a /libcaja-private | |
| parent | 9ea3b711a6a24d4b68231711129982a34938479b (diff) | |
| download | caja-a00bad28d88e1af9f8290192ec90287a42f736ef.tar.bz2 caja-a00bad28d88e1af9f8290192ec90287a42f736ef.tar.xz | |
Fix warnings from HiDPI commits
*caja-pathbar: fix warning,and in the process maybe fix occasional segfaults on opening mounted volumes from the desktop
*caja-icon-info: Stop gdk_cairo_surface_create_from_pixbuf: assertion 'GDK_IS_PIXBUF (pixbuf)' failed warning by handling NULL return from function finding the pixbuf
caja-icon-canvas-item-c: do not use g_object_unref where it does not work Stop the g_object_unref: assertion 'G_IS_OBJECT (object)' failed warnings on closing icon views
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 2 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-info.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 162fb338..7763811d 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -280,7 +280,7 @@ caja_icon_canvas_item_finalize (GObject *object) if (details->rendered_surface != NULL) { - g_object_unref (details->rendered_surface); + cairo_surface_destroy (details->rendered_surface); } if (details->editable_text_layout != NULL) diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c index 75c3330c..66ff7483 100644 --- a/libcaja-private/caja-icon-info.c +++ b/libcaja-private/caja-icon-info.c @@ -643,6 +643,9 @@ caja_icon_info_get_surface_nodefault_at_size (CajaIconInfo *icon, cairo_surface_t *surface; pixbuf = caja_icon_info_get_pixbuf_nodefault_at_size (icon, forced_size); + /*catch the case of caja_icon_info_get_pixbuf_nodefault_at_size returning NULL */ + if (!pixbuf) + return NULL; surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, icon->orig_scale, NULL); g_object_unref (pixbuf); |