# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1277933907 0
# Node ID 16738cb6bb6ba6588b18459266f1d44e53f61745
# Parent  c31e1c0cf27f9b2ec496936e087a441c7e683817# Parent  bc4771aff549cc978103b7d1136a0cb46d86a1d5
merge of '7c3cd4e07a01085a68042131f5075778e65b1ab6'
     and 'bc180436ff3297311929813e3dc6a1a77baa8817'

diff -r c31e1c0cf27f -r 16738cb6bb6b pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Wed Jun 30 21:34:50 2010 +0000
+++ b/pidgin/gtkprefs.c	Wed Jun 30 21:38:27 2010 +0000
@@ -2223,6 +2223,7 @@
 
 	gtk_widget_set_sensitive(hbox,
 			!strcmp(method, "automatic") ||
+			!strcmp(method, "alsa") ||
 			!strcmp(method, "esd"));
 }
 #endif /* USE_GSTREAMER */