Revert "Use the new style Gdk.Screen"

This reverts commit f6a8be9eb2a075d9733cc96e52897e856bbca898.

Conflicts:

	src/jarabe/view/viewsource.py

17 files changed, 32 insertions, 63 deletions

diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
index d5deb4d..dd4f8f3 100644
--- a/extensions/cpsection/aboutcomputer/view.py
+++ b/extensions/cpsection/aboutcomputer/view.py
@@ -20,7 +20,6 @@ import os
 from gettext import gettext as _
 
 import gtk
-import Gdk
 
 from sugar.graphics import style
 
@@ -190,8 +189,7 @@ class AboutComputer(SectionView):
                                  "conditions described therein."))
         label_info.set_alignment(0, 0)
         label_info.set_line_wrap(True)
-        screen = Gdk.Screen.get_default()
-        label_info.set_size_request(screen.width / 2, -1)
+        label_info.set_size_request(gtk.gdk.screen_width() / 2, -1)
         label_info.show()
         vbox_copyright.pack_start(label_info, expand=False)
 
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 2ad76ab..ef28f00 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 import gtk
-import Gdk
 import gobject
 from gettext import gettext as _
 
@@ -143,9 +142,8 @@ class Network(SectionView):
         self._entry.modify_bg(gtk.STATE_INSENSITIVE, 
                         style.COLOR_WHITE.get_gdk_color())
         self._entry.modify_base(gtk.STATE_INSENSITIVE, 
-                          style.COLOR_WHITE.get_gdk_color())
-        screen = Gdk.Screen.get_default()
-        self._entry.set_size_request(int(screen.width / 3), -1)
+                          style.COLOR_WHITE.get_gdk_color())          
+        self._entry.set_size_request(int(gtk.gdk.screen_width() / 3), -1)
         box_server.pack_start(self._entry, expand=False)
         self._entry.show()      
         box_mesh.pack_start(box_server, expand=False)
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 0766780..3d226fa 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -22,7 +22,6 @@ import traceback
 
 import gobject
 import gtk
-import Gdk
 
 from sugar.graphics.icon import Icon
 from sugar.graphics import style
@@ -44,9 +43,8 @@ class ControlPanel(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/jarabe/desktop/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py
index 12c324f..506446f 100644
--- a/src/jarabe/desktop/favoriteslayout.py
+++ b/src/jarabe/desktop/favoriteslayout.py
@@ -21,7 +21,6 @@ from gettext import gettext as _
 
 import gobject
 import gtk
-import Gdk
 import hippo
 
 from sugar.graphics import style
@@ -48,12 +47,10 @@ class FavoritesLayout(gobject.GObject, hippo.CanvasLayout):
         self.box = box
 
     def do_get_height_request(self, for_width):
-        screen = Gdk.Screen.get_default()
-        return 0, screen.height - style.GRID_CELL_SIZE
+        return 0, gtk.gdk.screen_height() - style.GRID_CELL_SIZE
 
     def do_get_width_request(self):
-        screen = Gdk.Screen.get_default()
-        return 0, screen.width
+        return 0, gtk.gdk.screen_width()
 
     def compare_activities(self, icon_a, icon_b):
         return 0
@@ -186,7 +183,7 @@ class RandomLayout(FavoritesLayout):
 
 _MINIMUM_RADIUS = style.XLARGE_ICON_SIZE / 2 + style.DEFAULT_SPACING + \
         style.STANDARD_ICON_SIZE * 2
-_MAXIMUM_RADIUS = (Gdk.Screen.get_default().height - style.GRID_CELL_SIZE) / 2 - \
+_MAXIMUM_RADIUS = (gtk.gdk.screen_height() - style.GRID_CELL_SIZE) / 2 - \
         style.STANDARD_ICON_SIZE - style.DEFAULT_SPACING
 
 class RingLayout(FavoritesLayout):
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index abae61b..03d9f16 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -22,7 +22,6 @@ import math
 import gobject
 import gconf
 import gtk
-import Gdk
 import hippo
 import dbus
 
@@ -315,8 +314,7 @@ class FavoritesView(hippo.Canvas):
     def add_alert(self, alert):
         if self._alert is not None:
             self.remove_alert()
-        screen = Gdk.Screen.get_default()
-        alert.set_size_request(screen.width, -1)
+        alert.set_size_request(gtk.gdk.screen_width(), -1)
         self._alert = hippo.CanvasWidget(widget=alert)
         self._box.append(self._alert, hippo.PACK_FIXED)
 
diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
index bb4e607..bbb0db1 100644
--- a/src/jarabe/desktop/homewindow.py
+++ b/src/jarabe/desktop/homewindow.py
@@ -17,7 +17,6 @@
 import logging
 
 import gtk
-import Gdk
 
 from sugar.graphics import style
 from sugar.graphics import palettegroup
@@ -45,9 +44,8 @@ class HomeWindow(gtk.Window):
 
         self._active = False
 
-        screen = Gdk.Screen.get_default()
-        self.set_default_size(screen.width,
-                              screen.height)
+        self.set_default_size(gtk.gdk.screen_width(),
+                              gtk.gdk.screen_height())
 
         self.realize()
         self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DESKTOP)
diff --git a/src/jarabe/desktop/spreadlayout.py b/src/jarabe/desktop/spreadlayout.py
index 359b0ba..ffc5bc7 100644
--- a/src/jarabe/desktop/spreadlayout.py
+++ b/src/jarabe/desktop/spreadlayout.py
@@ -17,7 +17,6 @@
 import hippo
 import gobject
 import gtk
-import Gdk
 
 from sugar.graphics import style
 
@@ -54,12 +53,10 @@ class SpreadLayout(gobject.GObject, hippo.CanvasLayout):
         self._box = box
 
     def do_get_height_request(self, for_width):
-        screen = Gdk.Screen.get_default()
-        return 0, screen.height - style.GRID_CELL_SIZE
+        return 0, gtk.gdk.screen_height() - style.GRID_CELL_SIZE
 
     def do_get_width_request(self):
-        screen = Gdk.Screen.get_default()
-        return 0, screen.width
+        return 0, gtk.gdk.screen_width()
 
     def do_allocate(self, x, y, width, height,
                     req_width, req_height, origin_changed):
diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py
index 12a9743..40f0a32 100644
--- a/src/jarabe/frame/clipboardtray.py
+++ b/src/jarabe/frame/clipboardtray.py
@@ -19,7 +19,6 @@ import logging
 import tempfile
 
 import gtk
-import Gdk
  
 from sugar import util
 from sugar.graphics import tray
@@ -59,7 +58,7 @@ class _ContextMap(object):
  
 class ClipboardTray(tray.VTray):
     
-    MAX_ITEMS = Gdk.Screen.get_default().height / style.GRID_CELL_SIZE - 2
+    MAX_ITEMS = gtk.gdk.screen_height() / style.GRID_CELL_SIZE - 2
     
     def __init__(self):
         tray.VTray.__init__(self, align=tray.ALIGN_TO_END)
diff --git a/src/jarabe/frame/eventarea.py b/src/jarabe/frame/eventarea.py
index 10f44b2..5b31b24 100644
--- a/src/jarabe/frame/eventarea.py
+++ b/src/jarabe/frame/eventarea.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gtk
-import Gdk
 import gobject
 import wnck
 import gconf
@@ -40,11 +39,10 @@ class EventArea(gobject.GObject):
         self._edge_delay = client.get_int('/desktop/sugar/frame/edge_delay')
         self._corner_delay = client.get_int('/desktop/sugar/frame/corner_delay')
 
-        screen = Gdk.Screen.get_default()
-        right = screen.width - 1
-        bottom = screen.height -1
-        width = screen.width - 2
-        height = screen.height - 2
+        right = gtk.gdk.screen_width() - 1
+        bottom = gtk.gdk.screen_height() -1
+        width = gtk.gdk.screen_width() - 2
+        height = gtk.gdk.screen_height() - 2
         
         if self._edge_delay != _MAX_DELAY:    
             invisible = self._create_invisible(1, 0, width, 1, 
diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
index b17ded5..0bb8d92 100644
--- a/src/jarabe/frame/frame.py
+++ b/src/jarabe/frame/frame.py
@@ -17,7 +17,6 @@
 import logging
 
 import gtk
-import Gdk
 import gobject
 import hippo
 
@@ -120,7 +119,7 @@ class Frame(object):
         self._left_panel = self._create_left_panel()
         self._right_panel = self._create_right_panel()
 
-        screen = Gdk.Screen.get_default()
+        screen = gtk.gdk.screen_get_default()
         screen.connect('size-changed', self._size_changed_cb)
 
         self._key_listener = _KeyListener(self)
diff --git a/src/jarabe/frame/frameinvoker.py b/src/jarabe/frame/frameinvoker.py
index df296dd..e4a13e1 100644
--- a/src/jarabe/frame/frameinvoker.py
+++ b/src/jarabe/frame/frameinvoker.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gtk
-import Gdk
 
 from sugar.graphics import style
 from sugar.graphics.palette import WidgetInvoker
@@ -24,11 +23,10 @@ def _get_screen_area():
     frame_thickness = style.GRID_CELL_SIZE
 
     x = y = frame_thickness
-    screen = Gdk.Screen.get_default()
-    width = screen.width - frame_thickness
-    height = screen.height - frame_thickness
+    width = gtk.gdk.screen_width() - frame_thickness
+    height = gtk.gdk.screen_height() - frame_thickness
 
-    return Gdk.Rectangle(x, y, width, height)
+    return gtk.gdk.Rectangle(x, y, width, height)
 
 class FrameWidgetInvoker(WidgetInvoker):
     def __init__(self, widget):
diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py
index 68fe2c9..02bb131 100644
--- a/src/jarabe/frame/framewindow.py
+++ b/src/jarabe/frame/framewindow.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gtk
-import Gdk
 import hippo
 
 from sugar.graphics import style
@@ -81,18 +80,17 @@ class FrameWindow(gtk.Window):
 
         self._update_size()
     
-        screen = Gdk.Screen.get_default()
+        screen = gtk.gdk.screen_get_default()
         screen.connect('size-changed', self._size_changed_cb)
 
     def append(self, child, flags=0):
         self._bg.append(child, flags)
 
     def _update_size(self):
-        screen = Gdk.Screen.get_default()
         if self._position == gtk.POS_TOP or self._position == gtk.POS_BOTTOM:
-            self.resize(screen.width, self.size)
+            self.resize(gtk.gdk.screen_width(), self.size)
         else:
-            self.resize(self.size, screen.height)
+            self.resize(self.size, gtk.gdk.screen_height())
 
     def _realize_cb(self, widget):
         self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
diff --git a/src/jarabe/journal/modalalert.py b/src/jarabe/journal/modalalert.py
index fe090a6..a5a86ab 100644
--- a/src/jarabe/journal/modalalert.py
+++ b/src/jarabe/journal/modalalert.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gtk
-import Gdk
 from gettext import gettext as _
 import gconf
 
diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py
index 603aeb4..b70cf72 100644
--- a/src/jarabe/journal/objectchooser.py
+++ b/src/jarabe/journal/objectchooser.py
@@ -19,7 +19,6 @@ import logging
 
 import gobject
 import gtk
-import Gdk
 import hippo
 import wnck
 
@@ -93,9 +92,8 @@ class ObjectChooser(gtk.Window):
 
         self._toolbar.set_mount_point('/')
         
-        screen = Gdk.Screen.get_default()
-        width = screen.width - style.GRID_CELL_SIZE * 2
-        height = screen.height - style.GRID_CELL_SIZE * 2        
+        width = gtk.gdk.screen_width() - style.GRID_CELL_SIZE * 2
+        height = gtk.gdk.screen_height() - style.GRID_CELL_SIZE * 2        
         self.set_size_request(width, height)
 
         if what_filter:
diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index 091b256..6ddb04a 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -17,7 +17,6 @@
 import logging
 
 import gtk
-import Gdk
 import hippo
 import gobject
 
@@ -40,7 +39,7 @@ class LaunchWindow(hippo.CanvasWindow):
 
         self.connect('realize', self.__realize_cb)
 
-        screen = Gdk.Screen.get_default()
+        screen = gtk.gdk.screen_get_default()
         screen.connect('size-changed', self.__size_changed_cb)
 
         self._update_size()
@@ -50,8 +49,7 @@ class LaunchWindow(hippo.CanvasWindow):
         self._box.zoom_in()
 
     def _update_size(self):
-        screen = Gdk.Screen.get_default()
-        self.resize(screen.width, screen.height)
+        self.resize(gtk.gdk.screen_width(), gtk.gdk.screen_height())
 
     def __realize_cb(self, widget):
         wm.set_activity_id(widget.window, str(self._activity_id))
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index 134f7f3..b1c85c6 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -16,7 +16,6 @@
 
 import logging
 import gtk
-import Gdk
 import gobject
 
 from jarabe.model import shell
@@ -34,7 +33,7 @@ class TabbingHandler(object):
         if not self._tabbing:
             logging.debug('Grabing the input.')
 
-            screen = Gdk.Screen.get_default()
+            screen = gtk.gdk.screen_get_default()
             window = screen.get_root_window()     
             keyboard_grab_result = gtk.gdk.keyboard_grab(window)
             pointer_grab_result = gtk.gdk.pointer_grab(window)
diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py
index afc7b1b..d5a6ddb 100644
--- a/src/jarabe/view/viewsource.py
+++ b/src/jarabe/view/viewsource.py
@@ -102,9 +102,8 @@ class ViewSource(gtk.Window):
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
         self.set_border_width(style.LINE_WIDTH)
 
-        screen = Gdk.Screen.get_default()
-        width = screen.width - style.GRID_CELL_SIZE * 2
-        height = screen.height - style.GRID_CELL_SIZE * 2        
+        width = gtk.gdk.screen_width() - style.GRID_CELL_SIZE * 2
+        height = gtk.gdk.screen_height() - style.GRID_CELL_SIZE * 2        
         self.set_size_request(width, height)
 
         self._parent_window_xid = window_xid