Getting presence service logging to work.

Don't lose debug state when switching tab.

3 files changed, 14 insertions, 9 deletions

diff --git a/shell/ConsoleWindow.py b/shell/ConsoleWindow.py
index be2e4a5..1986696 100644
--- a/shell/ConsoleWindow.py
+++ b/shell/ConsoleWindow.py
@@ -67,6 +67,8 @@ class ConsoleWindow(gtk.Window):
 		toolbar.insert(self._debug_toggle, -1)
 		self._debug_toggle.show()
 
+		self._ignore_toggle = False
+
 		vbox.pack_start(toolbar, False)
 		toolbar.show()
 
@@ -101,12 +103,16 @@ class ConsoleWindow(gtk.Window):
 		return console
 
 	def __debug_toggled_cb(self, button):
-		console = self._nb.get_nth_page(self._nb.get_current_page())
-		console.set_show_debug(button.get_active())
+		if not self._ignore_toggle:
+			console = self._nb.get_nth_page(self._nb.get_current_page())
+			console.set_show_debug(button.get_active())
 
 	def __page_changed_cb(self, notebook, page, page_num):
 		console = self._nb.get_nth_page(page_num)
+
+		self._ignore_toggle = True
 		self._debug_toggle.set_active(console.get_show_debug())
+		self._ignore_toggle = False
 
 	def set_page(self, page_id):
 		page = self._nb.page_num(self._consoles[page_id])
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()
diff --git a/shell/sugar-presence-service b/shell/sugar-presence-service
index 202ce13..fda0d12 100755
--- a/shell/sugar-presence-service
+++ b/shell/sugar-presence-service
@@ -4,7 +4,7 @@ import logging
 from PresenceService import PresenceService
 import sugar.logger
 
-#sugar.logger.start('PresenceService')
+sugar.logger.start('PresenceService')
 
 logging.info('Starting presence service')