Use the new style Gdk.Screen

4 files changed, 11 insertions, 6 deletions

diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 9809928..ebc7e3b 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -56,6 +56,7 @@ import traceback
 import gconf
 
 import gtk
+import Gdk
 import gobject
 import dbus
 import dbus.service
@@ -107,7 +108,8 @@ class ActivityToolbar(gtk.Toolbar):
 
         if activity.metadata:
             self.title = gtk.Entry()
-            self.title.set_size_request(int(gtk.gdk.screen_width() / 3), -1)
+            screen = Gdk.Screen.get_default()
+            self.title.set_size_request(int(screen.width / 3), -1)
             self.title.set_text(activity.metadata['title'])
             self.title.connect('changed', self.__title_changed_cb)
             self._add_widget(self.title)
diff --git a/src/sugar/activity/namingalert.py b/src/sugar/activity/namingalert.py
index 11b7688..41d392c 100644
--- a/src/sugar/activity/namingalert.py
+++ b/src/sugar/activity/namingalert.py
@@ -20,6 +20,7 @@ import os
 
 import gio
 import gtk
+import Gdk
 import gobject
 import hippo
 import gconf
@@ -167,8 +168,9 @@ class NamingAlert(gtk.Window):
 
         self.set_border_width(style.LINE_WIDTH)
         offset = style.GRID_CELL_SIZE
-        width = gtk.gdk.screen_width() - offset * 2
-        height = gtk.gdk.screen_height() - offset * 2
+        screen = Gdk.Screen.get_default()
+        width = screen.width - offset * 2
+        height = screen.height - offset * 2
         self.set_size_request(width, height)
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS) 
         self.set_decorated(False)
diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py
index 1c668b6..51b9ee4 100644
--- a/src/sugar/graphics/palette.py
+++ b/src/sugar/graphics/palette.py
@@ -23,6 +23,7 @@ STABLE.
 import logging
 
 import gtk
+import Gdk
 import gobject
 import hippo
 import pango
@@ -766,8 +767,8 @@ class Invoker(gobject.GObject):
 
         self.parent = None
 
-        self._screen_area = gtk.gdk.Rectangle(0, 0, gtk.gdk.screen_width(),
-                                              gtk.gdk.screen_height())
+        screen = Gdk.Screen.get_default()
+        self._screen_area = Gdk.Rectangle(0, 0, screen.width, screen.height)
         self._position_hint = self.ANCHORED
         self._cursor_x = -1
         self._cursor_y = -1
diff --git a/src/sugar/graphics/window.py b/src/sugar/graphics/window.py
index e82b3b9..bc403c8 100644
--- a/src/sugar/graphics/window.py
+++ b/src/sugar/graphics/window.py
@@ -62,7 +62,7 @@ class UnfullscreenButton(gtk.Window):
         self._button.connect('button-press-event', cb)
 
     def _reposition(self):
-        x = gtk.gdk.screen_width() - self._width
+        x = self.get_screen().width - self._width
         self.move(x, 0)
 
     def _size_request_cb(self, widget, req):