hotssh r48 - trunk/hotssh

[walters svn gnome org]

Author: walters
Date: Tue Aug  5 02:26:55 2008
New Revision: 48
URL: http://svn.gnome.org/viewvc/hotssh?rev=48&view=rev

Log:
Bug 546316: Don't fail if Avahi is not running (Dan Sanders)


Modified:
   trunk/hotssh/sshwindow.py

Modified: trunk/hotssh/sshwindow.py
==============================================================================
--- trunk/hotssh/sshwindow.py	(original)
+++ trunk/hotssh/sshwindow.py	Tue Aug  5 02:26:55 2008
@@ -280,9 +280,12 @@
         if not avahi_available:
             return
         
-        sysbus = dbus.SystemBus()
-        avahi_service = sysbus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER)
-        self.__avahi = dbus.Interface(avahi_service, avahi.DBUS_INTERFACE_SERVER)
+        try:
+            sysbus = dbus.SystemBus()
+            avahi_service = sysbus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER)
+            self.__avahi = dbus.Interface(avahi_service, avahi.DBUS_INTERFACE_SERVER)
+        except dbus.exceptions.DBusException:
+            return
 
         browser_ref = self.__avahi.ServiceBrowserNew(avahi.IF_UNSPEC,
                                                      avahi.PROTO_UNSPEC,