conduit r1183 - in trunk: . conduit/modules/NetworkModule

[johncarr svn gnome org]

Author: johncarr
Date: Thu Jan 10 20:22:21 2008
New Revision: 1183
URL: http://svn.gnome.org/viewvc/conduit?rev=1183&view=rev

Log:
Avahi might not be running, dont let that kill us

Modified:
   trunk/ChangeLog
   trunk/conduit/modules/NetworkModule/Client.py
   trunk/conduit/modules/NetworkModule/Peers.py

Modified: trunk/conduit/modules/NetworkModule/Client.py
==============================================================================
--- trunk/conduit/modules/NetworkModule/Client.py	(original)
+++ trunk/conduit/modules/NetworkModule/Client.py	Thu Jan 10 20:22:21 2008
@@ -32,7 +32,10 @@
         self.categories = {}
         self.dataproviders = {}
         self.peers = []
-        self.monitor = Peers.AvahiMonitor(self.host_available, self.host_removed)
+        try:
+            self.monitor = Peers.AvahiMonitor(self.host_available, self.host_removed)
+        except:
+            log.warn("Error starting client")
 
     def quit(self):
         for p in self.peers:

Modified: trunk/conduit/modules/NetworkModule/Peers.py
==============================================================================
--- trunk/conduit/modules/NetworkModule/Peers.py	(original)
+++ trunk/conduit/modules/NetworkModule/Peers.py	Thu Jan 10 20:22:21 2008
@@ -14,7 +14,7 @@
 import avahi
 import dbus, dbus.glib
 import logging
-log = logging.getLogger("modules.OpenSync")
+log = logging.getLogger("modules.Network")
 
 import conduit