Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorManuel QuiƱones <manuq@laptop.org>2012-09-04 07:29:23 (GMT)
committer Simon Schampijer <simon@laptop.org>2012-09-07 09:14:25 (GMT)
commit48b068b8bceecdd4bcba091dd9d7a355ae41b3ff (patch)
tree56fed466fa687408e30c54193f9fea9dbc0f422b /src
parentab0f7c2d544f05490dda8a2a15f7f3d47909a393 (diff)
HomeWindow: adopt to Gdk.Display get_pointer API changes
- display.get_pointer() API changes - window -> get_window() Signed-off-by: Manuel QuiƱones <manuq@laptop.org> Acked-by: Simon Schampijer <simon@laptop.org>
Diffstat (limited to 'src')
-rw-r--r--src/jarabe/desktop/homewindow.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
index 2ac222f..5bbc4ad 100644
--- a/src/jarabe/desktop/homewindow.py
+++ b/src/jarabe/desktop/homewindow.py
@@ -19,6 +19,7 @@ import logging
from gi.repository import GObject
from gi.repository import Gtk
from gi.repository import Gdk
+from gi.repository import GdkX11
from sugar3.graphics import style
from sugar3.graphics import palettegroup
@@ -120,7 +121,7 @@ class HomeWindow(Gtk.Window):
self._deactivate_view(shell.get_model().zoom_level)
else:
display = Gdk.Display.get_default()
- x_, y_, modmask = display.get_pointer(None)
+ screen_, x_, y_, modmask = display.get_pointer()
if modmask & Gdk.ModifierType.MOD1_MASK:
self._home_box.set_resume_mode(False)
else:
@@ -142,9 +143,10 @@ class HomeWindow(Gtk.Window):
# have to make the desktop window active
# since metacity doesn't make it on startup
timestamp = event.get_time()
+ x11_window = self.get_window()
if not timestamp:
- timestamp = GdkX11.x11_get_server_time(self.window)
- self.window.focus(timestamp)
+ timestamp = GdkX11.x11_get_server_time(x11_window)
+ x11_window.focus(timestamp)
def __zoom_level_changed_cb(self, **kwargs):
old_level = kwargs['old_level']