From b9f9ef0fe9e36cf6e5de59700154b16f2dae15cd Mon Sep 17 00:00:00 2001
From: Justin Gallardo <jirwin@suzy.(none)>
Date: Mon, 04 Dec 2006 19:12:24 +0000
Subject: Changed all tabs to 4 spaces for python style

---
(limited to 'sugar/emulator.py')

diff --git a/sugar/emulator.py b/sugar/emulator.py
index 638029e..b37dae6 100644
--- a/sugar/emulator.py
+++ b/sugar/emulator.py
@@ -24,108 +24,108 @@ import gobject
 from sugar import env
 
 def get_display_number():
-	"""Find a free display number trying to connect to 6000+ ports"""
-	retries = 20
-	display_number = 1
-	display_is_free = False	
-
-	while not display_is_free and retries > 0:
-		s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-		try:
-			s.connect(('127.0.0.1', 6000 + display_number))
-			s.close()
-
-			display_number += 1
-			retries -= 1
-		except:
-			display_is_free = True
-
-	if display_is_free:
-		return display_number
-	else:
-		logging.error('Cannot find a free display.')
-		sys.exit(0)
+    """Find a free display number trying to connect to 6000+ ports"""
+    retries = 20
+    display_number = 1
+    display_is_free = False    
+
+    while not display_is_free and retries > 0:
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            s.connect(('127.0.0.1', 6000 + display_number))
+            s.close()
+
+            display_number += 1
+            retries -= 1
+        except:
+            display_is_free = True
+
+    if display_is_free:
+        return display_number
+    else:
+        logging.error('Cannot find a free display.')
+        sys.exit(0)
 
 class Process:
-	"""Object representing one of the session processes"""
-
-	def __init__(self, command):
-		self._command = command
-	
-	def get_name(self):
-		return self._command
-	
-	def start(self, standard_output=False):
-		args = self._command.split()
-		flags = gobject.SPAWN_SEARCH_PATH
-		result = gobject.spawn_async(args, flags=flags,
-									 standard_output=standard_output)
-		self.pid = result[0]
-		self._stdout = result[2]
+    """Object representing one of the session processes"""
+
+    def __init__(self, command):
+        self._command = command
+    
+    def get_name(self):
+        return self._command
+    
+    def start(self, standard_output=False):
+        args = self._command.split()
+        flags = gobject.SPAWN_SEARCH_PATH
+        result = gobject.spawn_async(args, flags=flags,
+                                     standard_output=standard_output)
+        self.pid = result[0]
+        self._stdout = result[2]
 
 class MatchboxProcess(Process):
-	def __init__(self):
-		kbd_config = os.path.join(env.get_data_dir(), 'kbdconfig')
-		options = '-kbdconfig %s ' % kbd_config
+    def __init__(self):
+        kbd_config = os.path.join(env.get_data_dir(), 'kbdconfig')
+        options = '-kbdconfig %s ' % kbd_config
 
-		options += '-use_titlebar no '
-		options += '-theme olpc '
+        options += '-use_titlebar no '
+        options += '-theme olpc '
 
-		command = 'matchbox-window-manager %s ' % options
-		Process.__init__(self, command)
-	
-	def get_name(self):
-		return 'Matchbox'
+        command = 'matchbox-window-manager %s ' % options
+        Process.__init__(self, command)
+    
+    def get_name(self):
+        return 'Matchbox'
 
 class XephyrProcess(Process):
-	def __init__(self, fullscreen):
-		self._display = get_display_number()
-		cmd = 'Xephyr :%d -ac ' % (self._display)
-		if fullscreen:
-			cmd += '-fullscreen '
-		else:
-			cmd += '-screen 800x600 '
-		Process.__init__(self, cmd)
-		
-	def get_name(self):
-		return 'Xephyr'
-
-	def start(self):
-		Process.start(self)
-		os.environ['DISPLAY'] = ":%d" % (self._display)
-		os.environ['SUGAR_XEPHYR_PID'] = '%d' % self.pid
+    def __init__(self, fullscreen):
+        self._display = get_display_number()
+        cmd = 'Xephyr :%d -ac ' % (self._display)
+        if fullscreen:
+            cmd += '-fullscreen '
+        else:
+            cmd += '-screen 800x600 '
+        Process.__init__(self, cmd)
+        
+    def get_name(self):
+        return 'Xephyr'
+
+    def start(self):
+        Process.start(self)
+        os.environ['DISPLAY'] = ":%d" % (self._display)
+        os.environ['SUGAR_XEPHYR_PID'] = '%d' % self.pid
 
 
 class XnestProcess(Process):
-	def __init__(self):
-		self._display = get_display_number()
-		cmd = 'Xnest :%d -ac -geometry 800x600' % (self._display) 
-		Process.__init__(self, cmd)
-		
-	def get_name(self):
-		return 'Xnest'
-
-	def start(self):
-		Process.start(self)
-		os.environ['DISPLAY'] = ":%d" % (self._display)
+    def __init__(self):
+        self._display = get_display_number()
+        cmd = 'Xnest :%d -ac -geometry 800x600' % (self._display) 
+        Process.__init__(self, cmd)
+        
+    def get_name(self):
+        return 'Xnest'
+
+    def start(self):
+        Process.start(self)
+        os.environ['DISPLAY'] = ":%d" % (self._display)
 
 class Emulator(object):
-	"""The OLPC emulator"""
-	def __init__(self, fullscreen):
-		self._fullscreen = fullscreen
-
-	def start(self):
-		try:
-			process = XephyrProcess(self._fullscreen)
-			process.start()
-		except:
-			try:
-				process = XnestProcess()
-				process.start()
-			except:
-				print 'Cannot run the emulator. You need to install \
-					   Xephyr or Xnest.'
-				sys.exit(0)
-
-		process = MatchboxProcess()
-		process.start()
+    """The OLPC emulator"""
+    def __init__(self, fullscreen):
+        self._fullscreen = fullscreen
+
+    def start(self):
+        try:
+            process = XephyrProcess(self._fullscreen)
+            process.start()
+        except:
+            try:
+                process = XnestProcess()
+                process.start()
+            except:
+                print 'Cannot run the emulator. You need to install \
+                       Xephyr or Xnest.'
+                sys.exit(0)
+
+        process = MatchboxProcess()
+        process.start()
--
cgit v0.9.1