diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-09-21 20:22:55 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-09-21 21:58:04 +0200 |
| commit | 7439a7efda25b0e3acda393a390406c62e4f11af (patch) | |
| tree | f4e58ab21f258913301ab39d267b15ce67b8360d /demos | |
| parent | a43d5e28b853023745564428d1254dc0b52f086c (diff) | |
| download | gtk+-7439a7efda25b0e3acda393a390406c62e4f11af.tar.gz | |
widget-factory: Remove libcanberra support
GTK cannot depend on libcanberra-gtk which depends on GTK. This causes
a circular dependency and is especially neat if installed GTK is
different enough from uninstalled GTK.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/widget-factory/Makefile.am | 4 | ||||
| -rw-r--r-- | demos/widget-factory/widget-factory.c | 11 |
2 files changed, 2 insertions, 13 deletions
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 <glib/gi18n.h> #include <gtk/gtk.h> -#ifdef HAVE_LIBCANBERRA -#include <canberra-gtk.h> -#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 |