Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/gtk/gtkprefs.c Mon Nov 06 07:25:05 2006 +0000 +++ b/gtk/gtkprefs.c Mon Nov 06 07:38:05 2006 +0000 @@ -1403,10 +1403,8 @@ const char *method = value; gtk_widget_set_sensitive(hbox, - !strcmp(method, "automatic") || - !strcmp(method, "arts") || - !strcmp(method, "esd") || - !strcmp(method, "nas")); + !strcmp(method, "automatic") || + !strcmp(method, "esd")); } #endif /* USE_GSTREAMER */ #endif /* !_WIN32 */ @@ -1595,9 +1593,7 @@ _("Console beep"), "beep", #ifdef USE_GSTREAMER _("Automatic"), "automatic", - "Arts", "arts", "ESD", "esd", - "NAS", "nas", #endif _("Command"), "custom", _("No sounds"), "none",