pidgin: 4df46fdc: Revert 159826573dec53526cd1237639fdf5cf1...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 4df46fdc02c74f85a40b60514f6856df33b53d3b
Ancestor: 5387200488763be6c75c2073346fcf9063b6b132
Author: rlaager at pidgin.im
Date: 2008-05-26T06:31:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4df46fdc02c74f85a40b60514f6856df33b53d3b

Modified files:
        libpurple/core.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/core.c	2581c3fa2e6b208790ff7df215d5da286a4fdeff
+++ libpurple/core.c	296a5b4539aeeea43a5734240ea42982766dc38f
@@ -211,6 +211,7 @@ purple_core_quit(void)
 	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 @@ purple_core_quit(void)
 	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();