diff options
author | mike <michael.jmontcalm@gmail.com> | 2009-04-15 02:55:10 (GMT) |
---|---|---|
committer | mike <michael.jmontcalm@gmail.com> | 2009-04-15 02:55:10 (GMT) |
commit | 8ab1e32a479c018766f330ecf71670ef71492300 (patch) | |
tree | 529350bcb00d23c8c404510c594e4a6c5ffa6394 /src/sugar/tutorius/tests/filterstests.py | |
parent | 29177ac24ce70208a6225669a1275f67ac0f647a (diff) | |
parent | 0aae7813af4bb9ccdc4f02ba7cd483c8967078f1 (diff) |
Merge commit 'origin/lp349874'
Conflicts:
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/filterstests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/gtkutilstests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
Diffstat (limited to 'src/sugar/tutorius/tests/filterstests.py')
-rw-r--r-- | src/sugar/tutorius/tests/filterstests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sugar/tutorius/tests/filterstests.py b/src/sugar/tutorius/tests/filterstests.py index 4b7ae61..8ee6cc8 100644 --- a/src/sugar/tutorius/tests/filterstests.py +++ b/src/sugar/tutorius/tests/filterstests.py @@ -26,7 +26,7 @@ import time import gobject import gtk -from sugar.tutorius.filters import EventFilter, TimerEvent, GtkWidgetEventFilter +from sugar.tutorius.filters import EventFilter, TimerEvent, GtkWidgetEventFilter, GtkWidgetTypeFilter from gtkutilstests import SignalCatcher class BaseEventFilterTests(unittest.TestCase): |