19985N/A--- gnome-media-2.30.0/gstreamer-properties/gstreamer-properties.c-orig 2011-01-26 17:42:34.370674877 -0600

19985N/A+++ gnome-media-2.30.0/gstreamer-properties/gstreamer-properties.c 2011-01-26 17:49:45.028133772 -0600

19985N/A@@ -74,6 +74,10 @@ gst_properties_gconf_get_string (const g

19985N/A return value;

19985N/A }

19985N/A

19985N/A+static gchar GSTPROPS_KEY_DEFAULT_AUDIOSINK[] = "default/audiosink";

19985N/A+static gchar GSTPROPS_KEY_DEFAULT_CHATAUDIOSINK[] = "default/chataudiosink";

19985N/A+static gchar GSTPROPS_KEY_DEFAULT_MUSICAUDIOSINK[] = "default/musicaudiosink";

19985N/A+

19985N/A void

19985N/A gst_properties_gconf_set_string (const gchar * key, const gchar * value)

19985N/A {

19985N/A@@ -85,6 +89,19 @@ gst_properties_gconf_set_string (const g

19985N/A gconf_client_set_string (gconf_client, full_key, value, &error);

19985N/A g_free (full_key);

19985N/A

19985N/A+ /*

19985N/A+ * If setting "default/audiosink", also set the other keys that should be

19985N/A+ * kept in sync.

19985N/A+ */

19985N/A+ if (strcmp (key, GSTPROPS_KEY_DEFAULT_AUDIOSINK) == 0) {

19985N/A+ full_key = gst_properties_gconf_get_full_key (GSTPROPS_KEY_DEFAULT_CHATAUDIOSINK);

19985N/A+ gconf_client_set_string (gconf_client, full_key, value, &error);

19985N/A+ g_free (full_key);

19985N/A+ full_key = gst_properties_gconf_get_full_key (GSTPROPS_KEY_DEFAULT_MUSICAUDIOSINK);

19985N/A+ gconf_client_set_string (gconf_client, full_key, value, &error);

19985N/A+ g_free (full_key);

19985N/A+ }

19985N/A+

19985N/A if (error) {

19985N/A g_warning ("%s() error: %s", G_STRFUNC, error->message);

19985N/A g_error_free (error);