# This patch comes from upstream commit c0620e432650e81062c1967cc669829dbd29b310.
# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland

--- src/canberra-gtk-module.c.orig
+++ src/canberra-gtk-module.c
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
         guchar *data = NULL;
         gint ret = -1;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return 0;
+#endif
+
         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
         guchar *data = NULL;
         gint ret = -1;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return 0;
+#endif
+
         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
         gboolean ret = FALSE;
         Atom xembed;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return FALSE;
+#endif
+
         /* Gnome Panel applets are XEMBED windows. We need to make sure we
          * ignore them */
 
--- src/canberra-gtk.c.orig
+++ src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
         guchar *data = NULL;
         gint ret = -1;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return 0;
+#endif
+
         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
href='/guix/log/gnu?id=1c8b7745848e022bc719ae4ceba5973737e47bc3'>gnu</a>/<a href='/guix/log/gnu/installer?id=1c8b7745848e022bc719ae4ceba5973737e47bc3'>installer</a>/<a href='/guix/log/gnu/installer/user.scm?id=1c8b7745848e022bc719ae4ceba5973737e47bc3'>user.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/user.scm?id=1c8b7745848e022bc719ae4ceba5973737e47bc3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-22 16:00:29 +0200'>2022-09-22</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=4814ec284f8a2870e6457c05f414ad31df4e3f57'>installer: Move &lt;secret&gt; to utils and use it for crypt passwords.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/user.scm (&lt;secret&gt;, secret?, make-secret, secret-content): Move
to utils.scm.
* gnu/installer/utils.scm (&lt;secret&gt;, secret?, make-secret, secret-content):
Moved from user.scm.
* gnu/installer/newt/partition.scm (prompt-luks-passwords): Make password a
&lt;secret&gt;.
* gnu/installer/parted.scm (luks-format-and-open): Unwrap secret.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2022-08-08 11:54:25 +0200'>2022-08-08</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=ff9522fb69b9f4a31a5b766029e26dc53a2d1cf8'>installer: Add comments and vertical space to the generated config.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/parted.scm (user-partitions-&gt;configuration): Introduce
vertical space and a comment.
* gnu/installer/services.scm (G_): New macro.
(%system-services): Add comment for OpenSSH.
(system-services-&gt;configuration): Add vertical space and comments.
* gnu/installer/user.scm (users-&gt;configuration): Add comment.
* gnu/installer/steps.scm (format-configuration): Add comment.
(configuration-&gt;file): Expound leading comment.  Pass #:format-comment
to 'pretty-print-with-comments/splice'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-21 00:15:08 +0200'>2022-05-21</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=48c748226e2a94d2dec9bfdf84601455f00d6f5e'>Revert "installer: user: Remove useless filtering."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit c2125e59d0774cda3e559adeb056459a5f23586b.

Fixes &lt;https://issues.guix.gnu.org/55361&gt;.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-06 21:19:08 +0200'>2022-04-06</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=c2125e59d0774cda3e559adeb056459a5f23586b'>installer: user: Remove useless filtering.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/user.scm (users-&gt;configuration): Remove root account filtering
that is now performed in the "run-user-add-page" procedure.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2022-02-02 16:46:44 +0100'>2022-02-02</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=112ef30b84744872b3a7617d9e54b3df5db95560'>installer: Turn passwords into opaque records.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/user.scm (&lt;secret&gt;, secret?, make-secret,
secret-content): Add opaque &lt;secret&gt; record that boxes its contents,
with a custom printer that doesn't display anything.
* gnu/installer/newt/user.scm (run-user-add-page, run-user-page): Box
it.
* gnu/installer/final.scm (create-user-database): Unbox it.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>