From 0514a6372ae956ff1a5bcc6344f94335d468d010 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 11 Sep 2009 22:55:00 +0200 Subject: gtk: introduce two environment variables to force use of event sounds/input feedback --- src/canberra-gtk-module.c | 9 ++++++--- src/canberra-gtk.c | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index a2dcffd..a6bc0db 100644 --- a/src/canberra-gtk-module.c +++ b/src/canberra-gtk-module.c @@ -769,9 +769,12 @@ static void install_hook(GType type, const char *sig, guint *sn) { static void read_enable_input_feedback_sounds(GtkSettings *s) { gboolean enabled = !disabled; - g_object_get(G_OBJECT(s), "gtk-enable-input-feedback-sounds", &enabled, NULL); - - disabled = !enabled; + if (g_getenv("CANBERRA_FORCE_INPUT_FEEDBACK_SOUNDS")) + disabled = FALSE; + else { + g_object_get(G_OBJECT(s), "gtk-enable-input-feedback-sounds", &enabled, NULL); + disabled = !enabled; + } } static void enable_input_feedback_sounds_changed(GtkSettings *s, GParamSpec *arg1, gpointer userdata) { diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c index 44dc965..d6353d3 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -61,7 +61,8 @@ static void read_sound_theme_name(ca_context *c, GtkSettings *s) { static void read_enable_event_sounds(ca_context *c, GtkSettings *s) { gboolean enable_event_sounds = TRUE; - g_object_get(G_OBJECT(s), "gtk-enable-event-sounds", &enable_event_sounds, NULL); + if (!g_getenv("CANBERRA_FORCE_EVENT_SOUNDS")) + g_object_get(G_OBJECT(s), "gtk-enable-event-sounds", &enable_event_sounds, NULL); ca_context_change_props(c, CA_PROP_CANBERRA_ENABLE, enable_event_sounds ? "1" : "0", NULL); } -- cgit