From 26ba76b965984ddc8681a3c25ee075a6664c98ef Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 13 Oct 2009 15:13:30 +0000
Subject: Suppress race condition with Journal appearing on sugar startup #1373

---
(limited to 'src/jarabe')

diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index 8693e26..de5a66f 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -17,7 +17,6 @@
 
 import logging
 import time
-import subprocess
 
 import gconf
 import wnck
@@ -323,8 +322,6 @@ class ShellModel(gobject.GObject):
         self._screen.connect('window-closed', self._window_closed_cb)
         self._screen.connect('active-window-changed',
                              self._active_window_changed_cb)
-        self._screen.connect('window-manager-changed',
-                             self.__window_manager_changed_cb)
 
         self.zoom_level_changed = dispatch.Signal()
 
@@ -594,21 +591,6 @@ class ShellModel(gobject.GObject):
             self.notify_launch_failed(activity_id)
         return False
 
-    def __window_manager_changed_cb(self, screen):
-        wm_name = screen.get_window_manager_name()
-        if wm_name is not None:
-            logging.debug('Setup %s wm', wm_name)
-            self._setup_wm()
-
-    def _setup_wm(self):
-        # have to reset cursor(metacity sets it on startup)
-        if subprocess.call('xsetroot -cursor_name left_ptr', shell=True):
-            logging.warning('Can not reset cursor')
-
-        if subprocess.call('metacity-message disable-keybindings',
-                shell=True):
-            logging.warning('Can not disable metacity keybindings')
-
 
 _model = None
 
--
cgit v0.9.1