From: Sebastian Dröge <sebastian@centricular.com>
Date: Tue, 7 May 2019 06:53:51 +0000 (+0300)
Subject: GdkSurface - Don't call unimplemented NULL set_startup_id() vfunc on Win32
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~1692^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2bd6661cd3416ff0a96f4a329ac6bde032f5e33b;p=gtk4.git

GdkSurface - Don't call unimplemented NULL set_startup_id() vfunc on Win32

GdkSurface::set_startup_id() is NULL on Win32 and would cause a segfault
if called.

While the documentation of the main caller of set_startup_id(),
gtk_window_set_startup_id(), mentions that it's not implemented on
Windows it can still be automatically called via Glade and simply doing
nothing on Win32 is going to be less disruptive than a segfault.
---

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 589a17dfa7..7e95e6a74c 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -4202,7 +4202,10 @@ void
 gdk_surface_set_startup_id (GdkSurface   *surface,
                             const gchar *startup_id)
 {
-  GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_startup_id (surface, startup_id);
+  GdkSurfaceImplClass *klass = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
+
+  if (klass->set_startup_id)
+    klass->set_startup_id (surface, startup_id);
 }
 
 /**