From ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976 Mon Sep 17 00:00:00 2001
From: "H.Habighorst" <tearofadragon@googlemail.com>
Date: Sun, 23 Aug 2009 08:31:14 -0400
Subject: Bug 571488 - Migrate from deprecated gnome_sound to libcanberra

---
 mail/Makefile.am         | 2 ++
 mail/mail-folder-cache.c | 1 -
 mail/mail-session.c      | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 53b5bca508..63cceb43f3 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -17,6 +17,7 @@ AM_CPPFLAGS =						\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CERT_UI_CFLAGS)				\
 	$(THREADS_CFLAGS)				\
+	$(CANBERRA_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
@@ -164,6 +165,7 @@ libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(CANBERRA_LIBS)				\
 	$(GTKHTML_LIBS)					\
 	$(SMIME_LIBS)
 
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index bf728aa963..d19e163001 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -37,7 +37,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <libgnome/gnome-sound.h>
 #include <glib/gi18n.h>
 #include <camel/camel-store.h>
 #include <camel/camel-folder.h>
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 4bd0a5f78d..27fdaf9942 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -33,7 +33,7 @@
 
 #include <gconf/gconf-client.h>
 
-#include <libgnome/gnome-sound.h>
+#include <canberra-gtk.h>
 
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-flag.h>
@@ -462,7 +462,9 @@ static void
 main_play_sound (CamelFilterDriver *driver, gchar *filename, gpointer user_data)
 {
 	if (filename && *filename)
-		gnome_sound_play (filename);
+		ca_context_play(ca_gtk_context_get(), 0,
+				CA_PROP_MEDIA_FILENAME, filename,
+				NULL);
 	else
 		gdk_beep ();
 
-- 
cgit v1.2.3