Mercurial > pidgin.yaz
changeset 23192:ead0e6aa9c46
Revert 159826573dec53526cd1237639fdf5cf13826cf4 to fix a TODO about calling
purple_sound_uninit() late because ao_shutdown() would break our
environment. We're no longer using libao, so this shouldn't be an issue.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 26 May 2008 06:31:12 +0000 |
| parents | 849c3d109a38 |
| children | 20654db25ff8 |
| files | libpurple/core.c |
| diffstat | 1 files changed, 1 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Mon May 26 06:25:13 2008 +0000 +++ b/libpurple/core.c Mon May 26 06:31:12 2008 +0000 @@ -211,6 +211,7 @@ purple_savedstatuses_uninit(); purple_status_uninit(); purple_prefs_uninit(); + purple_sound_uninit(); purple_xfers_uninit(); purple_proxy_uninit(); purple_dnsquery_uninit(); @@ -223,19 +224,6 @@ if (ops != NULL && ops->quit != NULL) ops->quit(); - /* - * purple_sound_uninit() should be called as close to - * shutdown as possible. This is because the call - * to ao_shutdown() can sometimes leave our - * environment variables in an unusable state, which - * can cause a crash when getenv is called (by gettext - * for example). See the complete bug report at - * http://trac.xiph.org/cgi-bin/trac.cgi/ticket/701 - * - * TODO: Eventually move this call higher up with the others. - */ - purple_sound_uninit(); - purple_plugins_uninit(); #ifdef HAVE_DBUS purple_dbus_uninit();