From 62cb0e9595fbfa6e1ef7d1edfb968fef0ea253b4 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Thu, 09 Dec 2010 20:02:21 +0000
Subject: Revert debug logs pushed by mistake

This reverts commit 00e7bf0df597575455fc1cacd0096390fa17813f.

Conflicts:

	configure.ac
---
diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index b0d2e59..8c0aa8e 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -31,8 +31,6 @@ 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)
@@ -41,7 +39,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/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 647346b..96d0796 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 657f03c..af6ca69 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -197,6 +197,8 @@ 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()
 
--
cgit v0.9.1