From 44efc2a1315efe90eb2edc7a24b1372382222408 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Tue, 05 Feb 2008 00:21:55 +0000
Subject: Complete paths cleanup and remove SUGAR_PREFIX and

SUGAR_PATH environment variables.
---
(limited to 'sugar-emulator')

diff --git a/sugar-emulator b/sugar-emulator
deleted file mode 100755
index 12779dc..0000000
--- a/sugar-emulator
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import os
-import sys
-import socket
-import logging
-from optparse import OptionParser
-
-log = logging.getLogger( 'sugar-emulator' )
-log.setLevel( logging.DEBUG )
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-import gobject
-
-from sugar import env
-
-def _get_display_number():
-    """Find a free display number trying to connect to 6000+ ports"""
-    log.info( "Attempting to find free port for X11 (Xephyr)" )
-    retries = 20
-    display_number = 1
-    display_is_free = False
-
-    while not display_is_free and retries > 0:
-        lockstr = "/tmp/.X%d-lock" % display_number
-        if not os.path.exists(lockstr):
-            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            try:
-                s.connect(('127.0.0.1', 6000 + display_number))
-                s.close()
-            except:
-                display_is_free = True
-                break
-
-        display_number += 1
-        retries -= 1
-
-    if display_is_free:
-        log.info(
-            '  Found free port: #%s (%s)',
-            display_number, display_number+6000
-        )
-        return display_number
-    else:
-        logging.error('Cannot find a free display.')
-        sys.exit(0)
-
-def _start_xephyr(dpi=None):
-    display = _get_display_number()
-    log.info( 'Starting the Xephyr nested X display on display %s', display )
-
-    cmd = [ 'Xephyr' ]
-    cmd.append(':%d' % display)
-    cmd.append('-ac') 
-
-    if gtk.gdk.screen_width() < 1200 or gtk.gdk.screen_height() < 900:
-        cmd.append('-fullscreen')
-    else:
-        cmd.append('-screen')
-        cmd.append('%dx%d' % (1200, 900))
-
-    if not dpi:
-        dpi = gtk.settings_get_default().get_property('gtk-xft-dpi') / 1024
-    if dpi > 0:
-        cmd.append('-dpi')
-        cmd.append('%d' % dpi)
-
-    log.debug( 'Xephyr command: %s', " ".join( cmd ) )
-    result = gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
-    pid = result[0]
-
-    os.environ['DISPLAY'] = ":%d" % (display)
-    os.environ['SUGAR_EMULATOR_PID'] = str(pid)
-
-def _start_matchbox():
-    log.info( 'Starting the matchbox window manager' )
-    cmd = ['matchbox-window-manager']
-
-    cmd.extend(['-use_titlebar', 'no'])
-    cmd.extend(['-theme', 'sugar'])
-
-    log.debug( 'Matchbox command: %s', " ".join( cmd) )
-    gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
-
-def _setup_env():
-    os.environ['SUGAR_EMULATOR'] = 'yes'
-    os.environ['GABBLE_LOGFILE'] = os.path.join(
-            env.get_profile_path(), 'logs', 'telepathy-gabble.log')
-    os.environ['SALUT_LOGFILE'] = os.path.join(
-            env.get_profile_path(), 'logs', 'telepathy-salut.log')
-    os.environ['STREAM_ENGINE_LOGFILE'] = os.path.join(
-            env.get_profile_path(), 'logs', 'telepathy-stream-engine.log')
-
-def main():
-    """Script-level operations"""
-
-    parser = OptionParser()
-    parser.add_option('-x', '--xo-style', dest='xo_style',
-                      action='store_true', help='use the XO style')
-    (options, args) = parser.parse_args()
-
-    logging.basicConfig()
-
-    _setup_env()
-
-    if options.xo_style:
-        _start_xephyr(dpi=201)
-    else:
-        _start_xephyr()
-
-    if options.xo_style:
-        os.environ['SUGAR_XO_STYLE'] = 'yes'
-    else:
-        os.environ['SUGAR_XO_STYLE'] = 'no'
-    
-    if options.xo_style:
-        gtkrc_filename = 'sugar-xo.gtkrc'
-    else:
-        gtkrc_filename = 'sugar.gtkrc'
-        os.environ['SUGAR_XO_STYLE'] = 'no'
-    
-    os.environ['GTK2_RC_FILES'] = env.get_data_path(gtkrc_filename)
-
-    command = ['dbus-launch', 'dbus-launch', '--exit-with-session']
-
-    if not args:
-        command.append('sugar-shell')
-    else:
-        _start_matchbox()
-
-        if args[0].endswith('.py'):
-            command.append('python')
-
-        command.append(args[0])
-    
-    log.info( "Attempting to launch sugar to replace this process: %s", " ".join(command))
-    os.execlp( *command )
-
-if __name__ == "__main__":
-    main()
--
cgit v0.9.1