add missing comment terminator

[catta] / avahi-python / avahi-discover.in

diff --git a/avahi-python/avahi-discover.in b/avahi-python/avahi-discover.in
index 34bb4ce930a1e818724a926b9e609593f0d41300..23dee801bf56d3def8c381f0b1f2912e072285b8 100755 (executable)
--- a/avahi-python/avahi-discover.in
+++ b/avahi-python/avahi-discover.in
@@ -24,11 +24,16 @@ import os, sys
 try:
     import avahi, gtk, gobject, dbus, avahi.ServiceTypeDatabase
     from avahi.SimpleGladeApp import SimpleGladeApp
-except ImportError:
-    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+except ImportError, e:
+    print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus.\n Error: %s" % e
     sys.exit(1)
 
+
+## !!NOTE!! ##
+# It's really important to do this, else you won't see any events
+##
 try:
+    from dbus import DBusException
     import dbus.glib
 except ImportError, e:
     pass
@@ -36,6 +41,14 @@ except ImportError, e:
 service_type_browsers = {}
 service_browsers = {}
 
+def error_msg(msg):
+    d = gtk.MessageDialog(parent=None, flags=gtk.DIALOG_MODAL,
+                          type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK)
+    d.set_markup(msg)
+    d.show_all()
+    d.run()
+    d.destroy()
+
 glade_dir = "@interfacesdir@"
 
 service_type_db = avahi.ServiceTypeDatabase.ServiceTypeDatabase()
@@ -43,7 +56,7 @@ service_type_db = avahi.ServiceTypeDatabase.ServiceTypeDatabase()
 class Main_window(SimpleGladeApp):
     def __init__(self, path="avahi-discover.glade", root="main_window", domain=None, **kwargs):
         path = os.path.join(glade_dir, path)
-        gtk.window_set_default_icon_name("gnome-networktool")
+        gtk.window_set_default_icon_name("network-wired")
         SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
 
     def on_tree_view_cursor_changed(self, widget, *args):
@@ -158,8 +171,14 @@ class Main_window(SimpleGladeApp):
 
         if self.stype is None:
             print "Browsing domain '%s' on %i.%i ..." % (domain, interface, protocol)
-        
-            b = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceTypeBrowserNew(interface, protocol, domain, dbus.UInt32(0))),  avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER)
+
+            try:
+                b = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceTypeBrowserNew(interface, protocol, domain, dbus.UInt32(0))),  avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER)
+            except DBusException, e:
+                print e
+                error_msg("You should check that the avahi daemon is running.\n\nError : %s" % e)
+                sys.exit(0)
+                
             b.connect_to_signal('ItemNew', self.new_service_type)
 
             service_type_browsers[(interface, protocol, domain)] = b
@@ -242,7 +261,6 @@ class Main_window(SimpleGladeApp):
 
         
 def main():
-    gtk.window_set_default_icon_name("gnome-networktool")
     main_window = Main_window()
 
     main_window.run()