Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2010-12-08 18:34:34 (GMT)
committer Simon Schampijer <simon@schampijer.de>2010-12-08 18:34:34 (GMT)
commit00e7bf0df597575455fc1cacd0096390fa17813f (patch)
treee9bb2ae37ff6b34ffaa7412b13488a5a35879a65
parent4dcac522c6e88432f90938fb62e3e3073769e99c (diff)
Release 0.84.26v0.84.26
-rw-r--r--bin/sugar-emulator4
-rw-r--r--configure.ac2
-rw-r--r--extensions/deviceicon/volume.py10
-rw-r--r--src/jarabe/journal/journalactivity.py2
4 files changed, 9 insertions, 9 deletions
diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index 8c0aa8e..b0d2e59 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -31,6 +31,8 @@ def _run_xephyr(display, dpi, dimensions):
cmd.append(':%d' % display)
cmd.append('-ac')
+ cmd.append('-fullscreen')
+ '''
if dimensions is not None:
cmd.append('-screen')
cmd.append(dimensions)
@@ -39,7 +41,7 @@ def _run_xephyr(display, dpi, dimensions):
else:
cmd.append('-screen')
cmd.append('%dx%d' % (1200, 900))
-
+ '''
if dpi is None:
dpi = gtk.settings_get_default().get_property('gtk-xft-dpi') / 1024
if dpi > 0:
diff --git a/configure.ac b/configure.ac
index 251dba7..a468bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.84.25],[],[sugar])
+AC_INIT([Sugar],[0.84.26],[],[sugar])
AC_PREREQ([2.59])
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 96d0796..647346b 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -82,11 +82,11 @@ def setup(tray):
def _setup_volumes(tray):
volume_monitor = gio.volume_monitor_get()
- for volume in volume_monitor.get_volumes():
- _mount(volume, tray)
-
- for mount in volume_monitor.get_mounts():
- _add_device(mount, tray)
+ #for volume in volume_monitor.get_volumes():
+ # _mount(volume, tray)
+ #
+ #for mount in volume_monitor.get_mounts():
+ # _add_device(mount, tray)
volume_monitor.connect('volume-added', _volume_added_cb, tray)
volume_monitor.connect('mount-added', _mount_added_cb, tray)
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index af6ca69..657f03c 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -197,8 +197,6 @@ class JournalActivity(Window):
def _key_press_event_cb(self, widget, event):
keyname = gtk.gdk.keyval_name(event.keyval)
- logging.info(keyname)
- logging.info(event.state)
if keyname == 'Escape':
self.show_main_view()