From 8bb93666b35ee6277071d1b5ab4d52ae57d06975 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Sat, 9 Dec 2023 02:47:44 -0500 Subject: wayland desktop: suppress spatial window warning *When under wayland, silence "caja_spatial_window_show: assertion 'location != NULL' failed" *as the startup sequence is not the same with wlroots and the location isn't ready yet *Using gtk_widget_show instead of gtk_widget_realize in caja-desktop-window.c generates this warning --- src/caja-spatial-window.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c index 1028383d..df0baf28 100644 --- a/src/caja-spatial-window.c +++ b/src/caja-spatial-window.c @@ -313,6 +313,7 @@ caja_spatial_window_show (GtkWidget *widget) CajaWindow *window; CajaWindowSlot *slot; GFile *location; + GdkDisplay *display; window = CAJA_WINDOW (widget); slot = caja_window_get_active_slot (window); @@ -325,7 +326,17 @@ caja_spatial_window_show (GtkWidget *widget) } location = caja_window_slot_get_location (slot); - g_return_if_fail (location != NULL); + display = gtk_widget_get_display (widget); + + if (GDK_IS_X11_DISPLAY (display)) + g_return_if_fail (location != NULL); + + /*Return silently if this is a wayland desktop + *as the location isn't ready yet on first rendering + *but contents show fine, presumably from an update + */ + else if (location == NULL) + return; while (location != NULL) { CajaFile *file; -- cgit v1.2.1