From 27ae244d089a93eb2d00631e5f4c17a54a5b41fd Mon Sep 17 00:00:00 2001 From: Oli Date: Fri, 21 Sep 2007 00:18:18 +0000 Subject: Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam Conflicts: TamTamEdit.activity/Edit/MainWindow.py --- (limited to 'TamTamJam.activity/Jam') diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index 925d34d..414c759 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -779,7 +779,7 @@ class JamMain(gtk.EventBox): pix = gtk.gdk.pixbuf_new_from_file( img_path ) except: if Config.DEBUG >= 5: print "JamMain:: file does not exist: " + img_path - pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT + "/generic.png" ) + pix = gtk.gdk.pixbuf_new_from_file( Config.IMAGE_ROOT + "generic.png" ) x = (Block.Block.WIDTH-pix.get_width())//2 y = (Block.Block.HEIGHT-pix.get_height())//2 img = gtk.gdk.Pixmap( win, Block.Block.WIDTH, Block.Block.HEIGHT ) -- cgit v0.9.1