Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2009-07-12 10:11:00 (GMT)
committer Simon Schampijer <simon@schampijer.de>2009-07-12 10:11:00 (GMT)
commit5ddb8a8b75443dc1e69bd3d5f69b95437e589fde (patch)
tree0982724ee24ac4d09a783f673b8e140bba2fe849
parenteb82cb09ea5a6862daa1771d767460175b2c8bfe (diff)
parent59f230ca6470d5ab4d0546d0a9f4745753c3cf8c (diff)
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
-rw-r--r--bin/sugar-session2
-rw-r--r--src/jarabe/frame/framewindow.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/sugar-session b/bin/sugar-session
index d215dd7..1ce40a3 100644
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -136,6 +136,8 @@ def main():
client = gconf.client_get_default()
client.set_string('/desktop/gnome/peripherals/mouse/cursor_theme', 'sugar')
+ client.set_string('/apps/metacity/general/mouse_button_modifier',
+ 'disabled')
timezone = client.get_string('/desktop/sugar/date/timezone')
if timezone is not None and timezone:
diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py
index 5cb1241..87eefb9 100644
--- a/src/jarabe/frame/framewindow.py
+++ b/src/jarabe/frame/framewindow.py
@@ -93,6 +93,7 @@ class FrameWindow(gtk.Window):
self.resize(self.size, gtk.gdk.screen_height())
def _realize_cb(self, widget):
+ self.window.set_override_redirect(True)
self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK)
self.window.set_accept_focus(False)