[gnome-games/sudoku-tube] Make logger working

[Zhang Sen <zhangsen src gnome org>]

commit fa77d7e03bfeb3b88ceb5a425d484a1511e050ef
Author: Zhang Sen <zh jesse gmail com>
Date:   Mon Jun 22 20:32:49 2009 +0800

    Make logger working

 gnome-sudoku/src/lib/contact_selector.py |    4 +---
 gnome-sudoku/src/lib/main.py             |    7 ++++++-
 gnome-sudoku/src/lib/tp_tube.py          |    5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/contact_selector.py b/gnome-sudoku/src/lib/contact_selector.py
index 4e5cced..5ede8f3 100644
--- a/gnome-sudoku/src/lib/contact_selector.py
+++ b/gnome-sudoku/src/lib/contact_selector.py
@@ -29,9 +29,7 @@ import defaults
 
 dbus.mainloop.glib.DBusGMainLoop(set_as_default = True)
 
-logging.basicConfig()
-logger = logging.getLogger("contact_selector")
-logger.setLevel(logging.DEBUG)
+logger = logging.getLogger("main.contact_selector")
 
 
 def dbus_int_list_to_string(dbus_list):
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index 3b845f5..2f02a1c 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -5,6 +5,7 @@ try:
 except ImportError, err:
     print ("PyGTK not found. Please make sure it is installed properly and referenced in your PYTHONPATH environment variable.")
 
+import logging
 import os.path
 import threading
 
@@ -27,6 +28,9 @@ from gtk_goodies import gconf_wrapper, Undo, dialog_extras
 import contact_selector
 import tp_tube
 
+logging.basicConfig()
+logger = logging.getLogger("main")
+
 ICON_FACTORY = gtk.IconFactory()
 STOCK_PIXBUFS = {}
 for filename, stock_id in [('footprints.png', 'tracks'), ]:
@@ -134,7 +138,7 @@ class UI (gconf_wrapper.GConfWrapper):
 
         tube_service = 'org.gnome.Sudoku'
         bus_name, tube_handler = tp_tube.create_tube_handler(tube_service)
-        self.tube_handler = tube_handler
+        self.bus_name, self.tube_handler = bus_name, tube_handler
 
         self.timer = timer.ActiveTimer(self.w)
         self.won = False
@@ -859,6 +863,7 @@ class TrackerBox (gtk.VBox):
 def start_game(debug=False):
     if debug:
         print 'Starting GNOME Sudoku in debug mode'
+        logger.setLevel(logging.DEBUG)
 
     ##  You must call g_thread_init() before executing any other GLib
     ##  functions in a threaded GLib program.
diff --git a/gnome-sudoku/src/lib/tp_tube.py b/gnome-sudoku/src/lib/tp_tube.py
index 8027e06..b369c3b 100644
--- a/gnome-sudoku/src/lib/tp_tube.py
+++ b/gnome-sudoku/src/lib/tp_tube.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+import logging
+
 import dbus
 import dbus.service
 
@@ -10,6 +12,8 @@ from telepathy.interfaces import CHANNEL_TYPE_DBUS_TUBE
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
+logger = logging.getLogger("main.tp_tube")
+
 def create_tube_handler (service_name):
     """Create a DBus service on SessionBus and create tube handler on it
 
@@ -22,6 +26,7 @@ def create_tube_handler (service_name):
             service_name.replace('.','/')
 
     bus_name = dbus.service.BusName(handler_name, bus)
+    logger.debug("creating TubeHandler")
     tube_handler = TubeHandler(bus, handler_path)
     return bus_name, tube_handler