diff --git a/configure.ac b/configure.ac index 46794ce370..2338831b1d 100644 --- a/configure.ac +++ b/configure.ac @@ -1677,43 +1677,6 @@ if test "$have_colord" = "yes"; then fi AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes") -################################################## -# Check for libcanberra (only used in examples) -################################################## - -AC_ARG_ENABLE(libcanberra, - [AS_HELP_STRING([--enable-libcanberra], - [enable libcanberra support in examples [default=auto]])], - [enable_libcanberra="$enableval"], - [enable_libcanberra=auto]) - -if test "$enable_x11_backend" != "yes"; then - enable_libcanberra=no -fi - -AC_MSG_CHECKING([whether to use libcanberra]) -if test "$enable_libcanberra" != "no"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -have_libcanberra=no -if test "$enable_libcanberra" != "no"; then - PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3, - have_libcanberra=yes, have_libcanberra=no) - if test "$enable_libcanberra" = "yes"; then - if test "$have_libcanberra" = "no"; then - AC_MSG_ERROR([--enable-libcanberra specified, but not available]) - fi - fi -fi - -if test "$have_libcanberra" = "yes"; then - AC_DEFINE(HAVE_LIBCANBERRA, 1, [define if we have libcanberra]) -fi -AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes") - ################################################## # Checks for gtk-doc and docbook-tools ################################################## @@ -1988,7 +1951,6 @@ echo " Print backends: $PRINT_BACKENDS" echo " Dynamic modules: $build_dynamic_modules" echo " Included immodules: $included_immodules" echo " colord support: $have_colord" -echo " libcanberra support: $have_libcanberra" echo " Introspection: $found_introspection" echo " Debugging: $enable_debug" echo " Documentation: $enable_gtk_doc" diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am index a97b9eac43..bc08f4b143 100644 --- a/demos/widget-factory/Makefile.am +++ b/demos/widget-factory/Makefile.am @@ -19,13 +19,13 @@ gtk3_widget_factory_CPPFLAGS = \ -I$(top_srcdir) \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) \ - $(LIBCANBERRA_CFLAGS) + $(NULL) gtk3_widget_factory_LDADD = \ $(top_builddir)/gdk/libgdk-3.la \ $(top_builddir)/gtk/libgtk-3.la \ $(GTK_DEP_LIBS) \ - $(LIBCANBERRA_LIBS) + $(NULL) widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/widget-factory.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 6c0f8fa07f..4f3aa53bc8 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -22,9 +22,6 @@ #include #include -#ifdef HAVE_LIBCANBERRA -#include -#endif static void change_theme_state (GSimpleAction *action, @@ -658,11 +655,6 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) g_object_set_data (G_OBJECT (widget), "Gold", NULL); } -#ifdef HAVE_LIBCANBERRA - if (silver || gold) - ca_gtk_play_for_widget (widget, 0, "event.id", "message", NULL); -#endif - return; } @@ -703,9 +695,6 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) row = gtk_widget_get_parent (row); gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); g_object_set_data (G_OBJECT (widget), color, row); -#ifdef HAVE_LIBCANBERRA - ca_gtk_play_for_widget (widget, 0, "event.id", "complete", NULL); -#endif } static void