From 8715f7481bb34c076083a77bd76383749ee51845 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sun, 9 Dec 2018 12:58:00 +0100
Subject: [PATCH] core: Make MetaBell use MetaSoundPlayer to play the bell
 sound

Instead of using libcanberra/gtk+.
---
 src/core/bell.c | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/core/bell.c b/src/core/bell.c
index 45564b174..cd96275be 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -51,8 +51,6 @@
 
 #include "core/bell.h"
 
-#include <canberra-gtk.h>
-
 #include "compositor/compositor-private.h"
 #include "core/util-private.h"
 #include "core/window-private.h"
@@ -246,27 +244,14 @@ static gboolean
 bell_audible_notify (MetaDisplay *display,
                      MetaWindow  *window)
 {
-  ca_proplist *p;
-  int res;
+  MetaSoundPlayer *player;
 
-  ca_proplist_create (&p);
-  ca_proplist_sets (p, CA_PROP_EVENT_ID, "bell-window-system");
-  ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
-  ca_proplist_sets (p, CA_PROP_CANBERRA_CACHE_CONTROL, "permanent");
-
-  if (window)
-    {
-      ca_proplist_sets (p, CA_PROP_WINDOW_NAME, window->title);
-      ca_proplist_setf (p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long)window->xwindow);
-      ca_proplist_sets (p, CA_PROP_APPLICATION_NAME, window->res_name);
-      ca_proplist_setf (p, CA_PROP_APPLICATION_PROCESS_ID, "%d", window->net_wm_pid);
-    }
-
-  res = ca_context_play_full (ca_gtk_context_get (), 1, p, NULL, NULL);
-
-  ca_proplist_destroy (p);
-
-  return res == CA_SUCCESS || res == CA_ERROR_DISABLED;
+  player = meta_display_get_sound_player (display);
+  meta_sound_player_play_from_theme (player,
+                                     "bell-window-system",
+                                     _("Bell event"),
+                                     NULL);
+  return TRUE;
 }
 
 gboolean