Mercurial > pidgin
comparison gtk/gtkprefs.c @ 14910:fdbf71ae8775
[gaim-migrate @ 17682]
sf patch #1591071, from Ari Pollak
"This patch disables the seemingly obsolete NAS and arts
sound options since they're not provided in gstreamer
0.10. It also falls back more gracefully if we can't
get a proper GStreamer audiosink."
We're currently only using gconfaudiosink if the user
is running within Gnome. Do we want to keep doing that?
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 06 Nov 2006 07:38:05 +0000 |
parents | d17ae8987b11 |
children | f58283ce58ea |
comparison
equal
deleted
inserted
replaced
14909:c3a7d40d64bb | 14910:fdbf71ae8775 |
---|---|
1401 { | 1401 { |
1402 GtkWidget *hbox = data; | 1402 GtkWidget *hbox = data; |
1403 const char *method = value; | 1403 const char *method = value; |
1404 | 1404 |
1405 gtk_widget_set_sensitive(hbox, | 1405 gtk_widget_set_sensitive(hbox, |
1406 !strcmp(method, "automatic") || | 1406 !strcmp(method, "automatic") || |
1407 !strcmp(method, "arts") || | 1407 !strcmp(method, "esd")); |
1408 !strcmp(method, "esd") || | |
1409 !strcmp(method, "nas")); | |
1410 } | 1408 } |
1411 #endif /* USE_GSTREAMER */ | 1409 #endif /* USE_GSTREAMER */ |
1412 #endif /* !_WIN32 */ | 1410 #endif /* !_WIN32 */ |
1413 | 1411 |
1414 | 1412 |
1593 dd = gaim_gtk_prefs_dropdown(vbox, _("_Method:"), GAIM_PREF_STRING, | 1591 dd = gaim_gtk_prefs_dropdown(vbox, _("_Method:"), GAIM_PREF_STRING, |
1594 "/gaim/gtk/sound/method", | 1592 "/gaim/gtk/sound/method", |
1595 _("Console beep"), "beep", | 1593 _("Console beep"), "beep", |
1596 #ifdef USE_GSTREAMER | 1594 #ifdef USE_GSTREAMER |
1597 _("Automatic"), "automatic", | 1595 _("Automatic"), "automatic", |
1598 "Arts", "arts", | |
1599 "ESD", "esd", | 1596 "ESD", "esd", |
1600 "NAS", "nas", | |
1601 #endif | 1597 #endif |
1602 _("Command"), "custom", | 1598 _("Command"), "custom", |
1603 _("No sounds"), "none", | 1599 _("No sounds"), "none", |
1604 NULL); | 1600 NULL); |
1605 gtk_size_group_add_widget(sg, dd); | 1601 gtk_size_group_add_widget(sg, dd); |