diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 00:18:18 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 00:18:18 (GMT) |
| commit | 27ae244d089a93eb2d00631e5f4c17a54a5b41fd (patch) | |
| tree | 7c64f5ed4d2e77b90caf87993b24af103fedd519 /TamTamJam.activity/Jam | |
| parent | 72610bcaf281600e9925d65db8f9af89b14e558e (diff) | |
| parent | 3f04e198e432714701cbdabf7ff244b29a960724 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Conflicts:
TamTamEdit.activity/Edit/MainWindow.py
Diffstat (limited to 'TamTamJam.activity/Jam')
| -rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) |