comparison libpurple/mediamanager.c @ 31374:d72d728226dc

propagate from branch 'im.pidgin.pidgin' (head fb4d2b014576462db99d919dea15fbed03f1f48a) to branch 'im.pidgin.pidgin.next.minor' (head 4a5878f91c824f207ed343b57b36ae74e1baa438)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 13 Mar 2011 18:14:04 +0000
parents 17a4b32f4d46 017b7ff5a894
children fd1b4bbefc6b
comparison
equal deleted inserted replaced
31373:6c660dc7cb6a 31374:d72d728226dc
173 media->priv->backend_type = PURPLE_TYPE_MEDIA_BACKEND_FS2; 173 media->priv->backend_type = PURPLE_TYPE_MEDIA_BACKEND_FS2;
174 #endif 174 #endif
175 175
176 purple_prefs_add_none("/purple/media"); 176 purple_prefs_add_none("/purple/media");
177 purple_prefs_add_none("/purple/media/audio"); 177 purple_prefs_add_none("/purple/media/audio");
178 purple_prefs_add_int("/purple/media/audio/silence_threshold", 5);
178 purple_prefs_add_none("/purple/media/audio/volume"); 179 purple_prefs_add_none("/purple/media/audio/volume");
179 purple_prefs_add_int("/purple/media/audio/volume/input", 10); 180 purple_prefs_add_int("/purple/media/audio/volume/input", 10);
180 purple_prefs_add_int("/purple/media/audio/volume/output", 10); 181 purple_prefs_add_int("/purple/media/audio/volume/output", 10);
181 } 182 }
182 183