Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@sugarlabs.org>2009-05-05 11:49:41 (GMT)
committer Tomeu Vizoso <tomeu@sugarlabs.org>2009-05-05 11:49:41 (GMT)
commitad7ae46d3eb02358040f1b8d8fa0cfe425f96609 (patch)
tree4ab4e36aac611366181d1e0af7b367a2ce55da69
parentca98f41b58d5b185ec98e016f5c41d269eb190e9 (diff)
Fix settings in sugar-emulator
-rw-r--r--bin/sugar-emulator9
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index 9e761b4..6dbf4a4 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -23,6 +23,8 @@ from optparse import OptionParser
import bank
import Gtk
+Gtk.init_check(0, None)
+import Gdk
import gobject
from sugar import env
@@ -33,7 +35,8 @@ def _run_xephyr(display, dpi, dimensions, fullscreen):
cmd.append(':%d' % display)
cmd.append('-ac')
- screen_size = (Gtk.gdk.screen_width(), Gtk.gdk.screen_height())
+ screen = Gdk.Screen.get_default()
+ screen_size = (screen.width, screen.height)
if (not dimensions) and (fullscreen is None) and \
(screen_size < default_dimensions) :
@@ -44,8 +47,8 @@ def _run_xephyr(display, dpi, dimensions, fullscreen):
# => use default size (will get ignored for fullscreen)
dimensions = '%dx%d' % default_dimensions
- if not dpi :
- dpi = Gtk.settings_get_default().get_property('Gtk.xft-dpi') / 1024
+ if not dpi:
+ dpi = Gtk.Settings.get_default().get_property('Gtk.xft-dpi') / 1024
if fullscreen :
cmd.append('-fullscreen')