From 6eb7117c25bfea1c0970d67eff2e36f744aa3049 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Sun, 13 Aug 2006 00:57:12 +0000
Subject: Getting presence service logging to work.

Don't lose debug state when switching tab.
---
(limited to 'shell/session')

diff --git a/shell/session/Session.py b/shell/session/Session.py
index 9815897..752e6ee 100644
--- a/shell/session/Session.py
+++ b/shell/session/Session.py
@@ -16,7 +16,7 @@ import sugar.env
 class DbusProcess(Process):
 	def __init__(self):
 		config = sugar.env.get_dbus_config()
-		cmd = "dbus-launch --exit-with-session --config-file %s" % config
+		cmd = "dbus-daemon --print-address --config-file %s" % config
 		Process.__init__(self, cmd)
 
 	def get_name(self):
@@ -25,8 +25,7 @@ class DbusProcess(Process):
 	def start(self):
 		Process.start(self, True)
 		dbus_file = os.fdopen(self._stdout)
-		regexp = re.compile('DBUS_SESSION_BUS_ADDRESS=\'(.*)\'\;')
-		addr = regexp.match(dbus_file.readline()).group(1)
+		addr = dbus_file.readline().strip()
 		dbus_file.close()
 		os.environ["DBUS_SESSION_BUS_ADDRESS"] = addr
 
@@ -54,14 +53,14 @@ class Session:
 		process = DbusProcess()
 		process.start()
 
-		console = ConsoleWindow()
-		sugar.logger.start('Shell', console)
-
 		PresenceService.start()
 
 		process = MatchboxProcess()
 		process.start()
 
+		console = ConsoleWindow()
+		sugar.logger.start('Shell', console)
+
 		shell = Shell(self._registry)
 		shell.set_console(console)
 		shell.start()
--
cgit v0.9.1