rhythmbox r6071 - in trunk: . plugins/rb

[jmatthew svn gnome org]

Author: jmatthew
Date: Fri Nov 21 03:54:36 2008
New Revision: 6071
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6071&view=rev

Log:
2008-11-21  Jonathan Matthew  <jonathan d14n org>

	* plugins/rb/Loader.py:
	When invoking callbacks from an idle handler or a gio completion
	callback, take the gdk lock first.  Probably fixes #473757.


Modified:
   trunk/ChangeLog
   trunk/plugins/rb/Loader.py

Modified: trunk/plugins/rb/Loader.py
==============================================================================
--- trunk/plugins/rb/Loader.py	(original)
+++ trunk/plugins/rb/Loader.py	Fri Nov 21 03:54:36 2008
@@ -25,6 +25,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
 
 import gobject
+import gtk
 
 use_gio = False
 try:
@@ -39,6 +40,12 @@
 if use_gio is False:
 	import gnomevfs
 
+def callback_with_gdk_lock(callback, data, args):
+	gtk.gdk.threads_enter()
+	callback(data, *args)
+	gtk.gdk.threads_leave()
+	return False
+
 class GioSrc(object):
 	def __init__ (self):
 		pass
@@ -46,10 +53,10 @@
 	def _contents_cb(self, file, result, (callback, args)):
 		try:
 			(contents, length, etag) = file.load_contents_finish(result)
-			callback(contents, *args)
+			callback_with_gdk_lock(callback, contents, args)
 		except Exception, e:
 			print "error getting file contents: %s" % e
-			callback(None, *args)
+			callback_with_gdk_lock(callback, None, args)
 
 	def get_url (self, url, callback, *args):
 		try:
@@ -67,10 +74,10 @@
 	def read_cb (self, handle, buffer, exc_type, bytes_requested, (data, callback, args)):
 		if exc_type:
 			if issubclass (exc_type, gnomevfs.EOFError):
-				gobject.idle_add (callback, data, *args)
+				gobject.idle_add (callback_with_gdk_lock, callback, data, args)
 				handle.close (lambda *args: None)
 			else:
-				gobject.idle_add (callback, None, *args)
+				gobject.idle_add (callback_with_gdk_lock, callback, None, args)
 				handle.close (lambda *args: None)
 			return
  			
@@ -79,7 +86,7 @@
 
 	def open_cb (self, handle, exc_type, (data, callback, args)):
 		if exc_type:
-			gobject.idle_add (callback, None, *args)
+			gobject.idle_add (callback_with_gdk_lock, callback, None, args)
 			return
 
 		handle.read (self.chunk, self.read_cb, (data, callback, args))