Revert "Use the new style Gdk.Screen"

This reverts commit c794bc3d52b33dc461d6de9f1879f188ef590bc6.

4 files changed, 6 insertions, 11 deletions

diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index ebc7e3b..9809928 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -56,7 +56,6 @@ import traceback
 import gconf
 
 import gtk
-import Gdk
 import gobject
 import dbus
 import dbus.service
@@ -108,8 +107,7 @@ class ActivityToolbar(gtk.Toolbar):
 
         if activity.metadata:
             self.title = gtk.Entry()
-            screen = Gdk.Screen.get_default()
-            self.title.set_size_request(int(screen.width / 3), -1)
+            self.title.set_size_request(int(gtk.gdk.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 41d392c..11b7688 100644
--- a/src/sugar/activity/namingalert.py
+++ b/src/sugar/activity/namingalert.py
@@ -20,7 +20,6 @@ import os
 
 import gio
 import gtk
-import Gdk
 import gobject
 import hippo
 import gconf
@@ -168,9 +167,8 @@ class NamingAlert(gtk.Window):
 
         self.set_border_width(style.LINE_WIDTH)
         offset = style.GRID_CELL_SIZE
-        screen = Gdk.Screen.get_default()
-        width = screen.width - offset * 2
-        height = screen.height - offset * 2
+        width = gtk.gdk.screen_width() - offset * 2
+        height = gtk.gdk.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 fe2dd6b..60e82b7 100644
--- a/src/sugar/graphics/palette.py
+++ b/src/sugar/graphics/palette.py
@@ -23,7 +23,6 @@ STABLE.
 import logging
 
 import gtk
-import Gdk
 import gobject
 import hippo
 import pango
@@ -767,8 +766,8 @@ class Invoker(gobject.GObject):
 
         self.parent = None
 
-        screen = Gdk.Screen.get_default()
-        self._screen_area = Gdk.Rectangle(0, 0, screen.width, screen.height)
+        self._screen_area = gtk.gdk.Rectangle(0, 0, gtk.gdk.screen_width(),
+                                              gtk.gdk.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 bc403c8..e82b3b9 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 = self.get_screen().width - self._width
+        x = gtk.gdk.screen_width() - self._width
         self.move(x, 0)
 
     def _size_request_cb(self, widget, req):