summaryrefslogtreecommitdiff
path: root/caribou
diff options
context:
space:
mode:
authorNohemi Fernandez <nf68@cornell.edu>2011-08-04 12:54:36 -0500
committerEitan Isaacson <eitan@monotonous.org>2011-08-12 09:19:40 +0200
commit3f6509b748c05717deba62ebe2967b131d9a7bdb (patch)
treefe4a64932335936f0752f5ba4a8ef7d575733253 /caribou
parent7a368efc56c6f6a9d901c6a2727d184b786fc73a (diff)
downloadcaribou-3f6509b748c05717deba62ebe2967b131d9a7bdb.tar.gz
Add timestamp to show/hide Gtk module methods
Several signals may be passed to the GNOME shell to show/hide the keyboard. Since, the signals may be received in a different order than they were sent, we ignore older messages and process the newer ones.
Diffstat (limited to 'caribou')
-rw-r--r--caribou/antler/main.py4
-rw-r--r--caribou/antler/window.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/caribou/antler/main.py b/caribou/antler/main.py
index 46c0453..6bd3932 100644
--- a/caribou/antler/main.py
+++ b/caribou/antler/main.py
@@ -14,10 +14,10 @@ class AntlerKeyboardService(Caribou.KeyboardService):
loop = gobject.MainLoop()
loop.run()
- def do_show(self):
+ def do_show(self, timestamp):
self.window.show_all()
- def do_hide(self):
+ def do_hide(self, timestamp):
self.window.hide()
def do_set_cursor_location (self, x, y, w, h):
diff --git a/caribou/antler/window.py b/caribou/antler/window.py
index c567a93..a72203e 100644
--- a/caribou/antler/window.py
+++ b/caribou/antler/window.py
@@ -386,9 +386,9 @@ class AntlerWindowDocked(AntlerWindow):
x, y = self.get_position()
return self.animated_move(x + self.get_allocated_width(), y)
- def hide(self, timestamp):
+ def hide(self):
animation = self._roll_out()
- animation.connect('completed', lambda x: AntlerWindow.hide(self, timestamp))
+ animation.connect('completed', lambda x: AntlerWindow.hide(self))
class AntlerWindowEntry(AntlerWindow):
def __init__(self, keyboard_view_factory):