From 445b3a79bc502c0c65847199588d5e5c28d3945f Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 18 Jun 2011 10:11:02 -0400 Subject: [PATCH] ocarina: Don't do gtk locking anymore I added this to help with setting album art in other threads. Now that I'm forcing this to the main thread, I don't think I need it anymore. --- ocarina/__init__.py | 2 -- ocarina/body/image.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/ocarina/__init__.py b/ocarina/__init__.py index 355c5c69..781656d1 100644 --- a/ocarina/__init__.py +++ b/ocarina/__init__.py @@ -30,6 +30,4 @@ def run(): body.footer.set_art("images/ocarina.png") libsaria.startup() print "Startup took:", uptime() - gtk.threads_enter() gtk.main() - gtk.threads_leave() diff --git a/ocarina/body/image.py b/ocarina/body/image.py index 90b14a90..4ea99eed 100644 --- a/ocarina/body/image.py +++ b/ocarina/body/image.py @@ -48,10 +48,8 @@ class FileImage(gtk.Image): if path != self.path: self.path = path self.height = height - gtk.threads_enter() self.set_from_file(path) resize(self, height) - gtk.threads_leave() def tooltip(self, image, x, y, keyboard, tip): image = gtk.Image()