diff audacious/pluginenum.c @ 2159:35bdfcd17ba7 trunk

[svn] - change the cleanup order in mainwin_quit_cb() to avoid freeze on quit. - replace deprecated g_main_iteration() with g_main_context_iteration().
author yaz
date Mon, 18 Dec 2006 06:53:52 -0800
parents f18a5b617c34
children 894f7aa46f83
line wrap: on
line diff
--- 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);