Mercurial > pidgin3 / changeset

--- a/COPYRIGHT	Thu Jun 04 17:55:10 2020 +0000
+++ b/COPYRIGHT	Sun Jun 07 07:38:48 2020 +0000
@@ -462,6 +462,7 @@
 R. Ramkumar
 Rajesh Ranjan
 Mart Raudsepp
+Debarshi Ray
 Etan Reisner
 David Reiss
 Luoh Ren-Shan

--- a/finch/gntsound.c	Thu Jun 04 17:55:10 2020 +0000
+++ b/finch/gntsound.c	Sun Jun 07 07:38:48 2020 +0000
@@ -513,11 +513,7 @@
 	if (gst_init_failed)  /* Perhaps do beep instead? */
 		return;
 	if (purple_strequal(method, "automatic")) {
-		if (purple_running_gnome()) {
-			sink = gst_element_factory_make("gconfaudiosink", "sink");
-		}
-		if (!sink)
-			sink = gst_element_factory_make("autoaudiosink", "sink");
+		sink = gst_element_factory_make("autoaudiosink", "sink");
 		if (!sink) {
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;

--- a/pidgin/gtksound.c	Thu Jun 04 17:55:10 2020 +0000
+++ b/pidgin/gtksound.c	Sun Jun 07 07:38:48 2020 +0000
@@ -520,7 +520,7 @@
 		if (sink == NULL)
 			sink = gst_element_factory_make("waveformsink", "sink");
 		if (sink == NULL)
-			sink = gst_element_factory_make("gconfaudiosink", "sink");
+			sink = gst_element_factory_make("autoaudiosink", "sink");
 	} else if (purple_strequal(method, "directsound")) {
 		sink = gst_element_factory_make("directsoundsink", "sink");
 	} else if (purple_strequal(method, "waveform")) {
@@ -528,7 +528,7 @@
 	}
 #else
 	if (purple_strequal(method, "automatic")) {
-		sink = gst_element_factory_make("gconfaudiosink", "sink");
+		sink = gst_element_factory_make("autoaudiosink", "sink");
 	} else if (purple_strequal(method, "esd")) {
 		sink = gst_element_factory_make("esdsink", "sink");
 	} else if (purple_strequal(method, "alsa")) {