diff options
author | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-06-03 06:44:51 (GMT) |
---|---|---|
committer | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-06-03 06:44:51 (GMT) |
commit | 797a450c35931773224f87efd0cc38e279fcdf69 (patch) | |
tree | e951ffa91a33400ce0289362ed7af0faaed9c7c4 | |
parent | 64caddc2f58dee13d03da4a4ea03baaf2e6fe6cd (diff) |
Fixed missing redraw.svg in the all in one bundle.
Fixed a potential (low occurence) python tracaback on undefined
event.x.
-rw-r--r-- | src/redraw-activity/Makefile.am | 2 | ||||
-rw-r--r-- | src/redraw-activity/redraw.py | 4 | ||||
-rw-r--r-- | src/redraw_symmetrical-activity/Makefile.am | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/redraw-activity/Makefile.am b/src/redraw-activity/Makefile.am index d514ee6..a470714 100644 --- a/src/redraw-activity/Makefile.am +++ b/src/redraw-activity/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = +SUBDIRS = resources pythondir = $(PYTHON_PLUGIN_DIR) diff --git a/src/redraw-activity/redraw.py b/src/redraw-activity/redraw.py index ca47b38..42f3d90 100644 --- a/src/redraw-activity/redraw.py +++ b/src/redraw-activity/redraw.py @@ -921,7 +921,7 @@ class Gcompris_redraw: if event.type == gtk.gdk.LEAVE_NOTIFY: self.display_coord(event.x,event.y, 3) - else: + elif event.type == gtk.gdk.MOTION_NOTIFY: self.display_coord(event.x,event.y, 2) @@ -930,7 +930,7 @@ class Gcompris_redraw: if event.type == gtk.gdk.LEAVE_NOTIFY: self.display_coord(event.x,event.y, 3) - else: + elif event.type == gtk.gdk.MOTION_NOTIFY: self.display_coord(event.x,event.y, 1) if event.type == gtk.gdk.BUTTON_PRESS: diff --git a/src/redraw_symmetrical-activity/Makefile.am b/src/redraw_symmetrical-activity/Makefile.am index 78e9357..4cf3372 100644 --- a/src/redraw_symmetrical-activity/Makefile.am +++ b/src/redraw_symmetrical-activity/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = - - +SUBDIRS = resources xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ |