diff options
| author | H.Habighorst <tearofadragon@googlemail.com> | 2009-08-23 20:31:14 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-23 20:31:14 +0800 |
| commit | ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976 (patch) | |
| tree | 12165a7c8893a318994897c4899f68c653c11882 /mail | |
| parent | 8443ed41e32438e22e862d5645117cfdb2f03cc9 (diff) | |
| download | gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.tar gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.tar.gz gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.tar.bz2 gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.tar.lz gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.tar.xz gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.tar.zst gsoc2013-evolution-ff7084ffe4a935a4cfafc9cd44a9b9daf43cb976.zip | |
Bug 571488 - Migrate from deprecated gnome_sound to libcanberra
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/Makefile.am | 2 | ||||
| -rw-r--r-- | mail/mail-folder-cache.c | 1 | ||||
| -rw-r--r-- | mail/mail-session.c | 6 |
3 files changed, 6 insertions, 3 deletions
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 (); |