# HG changeset patch
# User yaz
# Date 1166453632 28800
# Node ID 35bdfcd17ba79254770039ae6decf140fcffcd7d
# Parent  ba9deed2f12129c3ef5d075f2e559fad0275dcfa
[svn] - change the cleanup order in mainwin_quit_cb() to avoid freeze on quit.
- replace deprecated g_main_iteration() with g_main_context_iteration().

diff -r ba9deed2f121 -r 35bdfcd17ba7 ChangeLog
--- a/ChangeLog	Mon Dec 18 04:15:09 2006 -0800
+++ b/ChangeLog	Mon Dec 18 06:53:52 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-18 12:15:09 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3321]
+  - damn SVN reverted this to some old version
+  
+  trunk/audacious/ui/playlist.ui |  133 ++++++++++++++++++++---------------------
+  1 file changed, 67 insertions(+), 66 deletions(-)
+
+
 2006-12-18 12:13:20 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3319]
   - fix XML description of the playlist editor (unbreak menus)
diff -r ba9deed2f121 -r 35bdfcd17ba7 audacious/mainwin.c
--- a/audacious/mainwin.c	Mon Dec 18 04:15:09 2006 -0800
+++ b/audacious/mainwin.c	Mon Dec 18 06:53:52 2006 -0800
@@ -717,6 +717,8 @@
 
     ctrlsocket_cleanup();
 
+    plugin_system_cleanup();
+
     playlist_stop_get_info_thread();
 
     /* free and clear each playlist */
@@ -730,8 +732,6 @@
     }
     g_list_free( playlists_top );
 
-    plugin_system_cleanup();
-
     gtk_main_quit();
 
     exit(EXIT_SUCCESS);
diff -r ba9deed2f121 -r 35bdfcd17ba7 audacious/pluginenum.c
--- a/audacious/pluginenum.c	Mon Dec 18 04:15:09 2006 -0800
+++ b/audacious/pluginenum.c	Mon Dec 18 06:53:52 2006 -0800
@@ -392,7 +392,7 @@
         if (ip && ip->cleanup) {
             ip->cleanup();
             GDK_THREADS_LEAVE();
-            while (g_main_iteration(FALSE));
+            while (g_main_context_iteration(NULL, FALSE));
             GDK_THREADS_ENTER();
         }
         g_module_close(ip->handle);
@@ -406,7 +406,7 @@
         if (op && op->cleanup) {
             op->cleanup();
             GDK_THREADS_LEAVE();
-            while (g_main_iteration(FALSE));
+            while (g_main_context_iteration(NULL, FALSE));
             GDK_THREADS_ENTER();
         }
         g_module_close(op->handle);
@@ -420,7 +420,7 @@
         if (ep && ep->cleanup) {
             ep->cleanup();
             GDK_THREADS_LEAVE();
-            while (g_main_iteration(FALSE));
+            while (g_main_context_iteration(NULL, FALSE));
             GDK_THREADS_ENTER();
         }
         g_module_close(ep->handle);
@@ -439,7 +439,7 @@
         g_list_free(gp_data.enabled_list);
 
     GDK_THREADS_LEAVE();
-    while (g_main_iteration(FALSE));
+    while (g_main_context_iteration(NULL, FALSE));
     GDK_THREADS_ENTER();
 #endif
 
@@ -448,7 +448,7 @@
         if (gp && gp->cleanup) {
             gp->cleanup();
             GDK_THREADS_LEAVE();
-            while (g_main_iteration(FALSE));
+            while (g_main_context_iteration(NULL, FALSE));
             GDK_THREADS_ENTER();
         }
         g_module_close(gp->handle);
@@ -467,7 +467,7 @@
         g_list_free(vp_data.enabled_list);
 
     GDK_THREADS_LEAVE();
-    while (g_main_iteration(FALSE));
+    while (g_main_context_iteration(NULL, FALSE));
     GDK_THREADS_ENTER();
 #endif
 
@@ -476,7 +476,7 @@
         if (vp && vp->cleanup) {
             vp->cleanup();
             GDK_THREADS_LEAVE();
-            while (g_main_iteration(FALSE));
+            while (g_main_context_iteration(NULL, FALSE));
             GDK_THREADS_ENTER();
         }
         g_module_close(vp->handle);
@@ -490,7 +490,7 @@
         if (lp && lp->cleanup) {
             lp->cleanup();
             GDK_THREADS_LEAVE();
-            while (g_main_iteration(FALSE));
+            while (g_main_context_iteration(NULL, FALSE));
             GDK_THREADS_ENTER();
         }
         g_module_close(lp->handle);