[gnome-settings-daemon] color: Require libcanberra

[Bastien Nocera <hadess src gnome org>]

commit 72c5941770f5fb1153e087dc34158a702acbd758
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 19 13:58:54 2011 +0100

    color: Require libcanberra
    
    https://bugzilla.gnome.org/show_bug.cgi?id=659338

 configure.ac                      |   11 +----------
 plugins/color/Makefile.am         |    2 --
 plugins/color/gsd-color-manager.c |    7 -------
 3 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7031ebd..aff0f8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,16 +107,7 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
 dnl ---------------------------------------------------------------------------
 dnl - Check for colord
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-
-dnl ---------------------------------------------------------------------------
-dnl - Check for libcanberra
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3,
-                  [have_libcanberra=true
-                  AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define if libcanberra should be used])],
-                  [have_libcanberra=false])
-AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xtrue")
+PKG_CHECK_MODULES(COLORD, colord >= 0.1.12 libcanberra-gtk3)
 
 dnl ---------------------------------------------------------------------------
 dnl - Check for LCMS2
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 6d80602..9627b16 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -26,7 +26,6 @@ libcolor_la_CPPFLAGS = \
 libcolor_la_CFLAGS = \
 	$(PLUGIN_CFLAGS)		\
 	$(COLORD_CFLAGS)		\
-	$(LIBCANBERRA_CFLAGS)		\
 	$(LCMS_CFLAGS)			\
 	$(GNOME_DESKTOP_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
@@ -38,7 +37,6 @@ libcolor_la_LDFLAGS = 			\
 
 libcolor_la_LIBADD  = 			\
 	$(COLORD_LIBS)			\
-	$(LIBCANBERRA_LIBS)		\
 	$(GNOME_DESKTOP_LIBS)		\
 	$(LCMS_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)		\
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index 14a4576..6b0561a 100644
--- a/plugins/color/gsd-color-manager.c
+++ b/plugins/color/gsd-color-manager.c
@@ -27,10 +27,7 @@
 #include <gdk/gdk.h>
 #include <stdlib.h>
 #include <lcms2.h>
-
-#ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
-#endif
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-rr.h>
@@ -1917,14 +1914,12 @@ gcm_session_sensor_added_cb (CdClient *client,
                              CdSensor *sensor,
                              GsdColorManager *manager)
 {
-#ifdef HAVE_LIBCANBERRA
         ca_context_play (ca_gtk_context_get (), 0,
                          CA_PROP_EVENT_ID, "device-added",
                          /* TRANSLATORS: this is the application name */
                          CA_PROP_APPLICATION_NAME, _("GNOME Settings Daemon Color Plugin"),
                         /* TRANSLATORS: this is a sound description */
                          CA_PROP_EVENT_DESCRIPTION, _("Color calibration device added"), NULL);
-#endif
 
         /* open up the color prefs window */
         gcm_session_exec_control_center (manager);
@@ -1935,14 +1930,12 @@ gcm_session_sensor_removed_cb (CdClient *client,
                                CdSensor *sensor,
                                GsdColorManager *manager)
 {
-#ifdef HAVE_LIBCANBERRA
         ca_context_play (ca_gtk_context_get (), 0,
                          CA_PROP_EVENT_ID, "device-removed",
                          /* TRANSLATORS: this is the application name */
                          CA_PROP_APPLICATION_NAME, _("GNOME Settings Daemon Color Plugin"),
                         /* TRANSLATORS: this is a sound description */
                          CA_PROP_EVENT_DESCRIPTION, _("Color calibration device removed"), NULL);
-#endif
 }
 
 static void