From: Lennart Poettering Date: Mon, 28 Jun 2010 20:48:53 +0000 (+0200) Subject: i18n: make avahi-discover translatable. X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=d65a31ce300db68c303b9ff72c52b78dbf1ba598;p=catta i18n: make avahi-discover translatable. Original patch from "fujiwara" http://avahi.org/ticket/122 --- diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am index 454fd57..d16bd11 100644 --- a/avahi-python/avahi-discover/Makefile.am +++ b/avahi-python/avahi-discover/Makefile.am @@ -19,7 +19,7 @@ AM_CFLAGS=-I$(top_srcdir) EXTRA_DIST = \ __init__.py \ - avahi-discover.in \ + avahi-discover.py \ avahi-discover.desktop.in.in if HAVE_PYTHON @@ -53,10 +53,10 @@ endif avahi-discover.desktop.in: avahi-discover.desktop.in.in $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ -avahi-discover: avahi-discover.in +avahi-discover: avahi-discover.py $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \ - -e 's,@LOCALEDIR\@,"$(datadir)/locale",g' \ + -e 's,@LOCALEDIR\@,"$(avahilocaledir)",g' \ -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ && \ chmod +x $@ diff --git a/avahi-python/avahi-discover/avahi-discover.in b/avahi-python/avahi-discover/avahi-discover.in deleted file mode 100755 index ac6b657..0000000 --- a/avahi-python/avahi-discover/avahi-discover.in +++ /dev/null @@ -1,281 +0,0 @@ -#!@PYTHON@ -# -*-python-*- -# This file is part of avahi. -# -# avahi is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# avahi is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -# License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with avahi; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -import os, sys - -try: - import avahi, gettext, gtk, gobject, dbus, avahi.ServiceTypeDatabase - _ = gettext.gettext -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) -except Exception, e: - print "Failed to initialize: %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 - -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() - -ui_dir = "@interfacesdir@" - -service_type_db = avahi.ServiceTypeDatabase.ServiceTypeDatabase() - -class Main_window: - def __init__(self, path="avahi-discover.ui", root="main_window", domain=None, **kwargs): - path = os.path.join(ui_dir, path) - gtk.window_set_default_icon_name("network-wired") - self.ui = gtk.Builder() - self.ui.add_from_file(path) - self.ui.connect_signals(self) - self.tree_view = self.ui.get_object("tree_view") - self.info_label = self.ui.get_object("info_label") - self.new() - - def on_tree_view_cursor_changed(self, widget, *args): - (model, iter) = widget.get_selection().get_selected() - stype = None - if iter is not None: - (name,interface,protocol,stype,domain) = self.treemodel.get(iter,1,2,3,4,5) - if stype == None: - self.info_label.set_markup("No service currently selected.") - return - #Asynchronous resolving - self.server.ResolveService( int(interface), int(protocol), name, stype, domain, avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved, error_handler=self.print_error) - - def protoname(self,protocol): - if protocol == avahi.PROTO_INET: - return "IPv4" - if protocol == avahi.PROTO_INET6: - return "IPv6" - return "n/a" - - def siocgifname(self, interface): - if interface <= 0: - return "n/a" - else: - return self.server.GetNetworkInterfaceNameByIndex(interface) - - def get_interface_name(self, interface, protocol): - if interface == avahi.IF_UNSPEC and protocol == avahi.PROTO_UNSPEC: - return "Wide Area" - else: - return str(self.siocgifname(interface)) + " " + str(self.protoname(protocol)) - - def service_resolved(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): - print "Service data for service '%s' of type '%s' in domain '%s' on %i.%i:" % (name, stype, domain, interface, protocol) - - print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, str(avahi.txt_array_to_string_array(txt))) - - self.update_label(interface, protocol, name, stype, domain, host, aprotocol, address, port, avahi.txt_array_to_string_array(txt)) - - def print_error(self, err): - error_label = "Error: %s" % (err) - self.info_label.set_markup(error_label) - print "Error:", str(err) - - def lookup_type(self, stype): - global service_type_db - - try: - return service_type_db[stype] - except KeyError: - return stype - - def new_service(self, interface, protocol, name, stype, domain, flags): - print "Found service '%s' of type '%s' in domain '%s' on %i.%i." % (name, stype, domain, interface, protocol) - if self.zc_ifaces.has_key((interface,protocol)) == False: - - ifn = self.get_interface_name(interface, protocol) - - self.zc_ifaces[(interface,protocol)] = self.insert_row(self.treemodel, None, ifn, None,interface,protocol,None,domain) - if self.zc_domains.has_key((interface,protocol,domain)) == False: - self.zc_domains[(interface,protocol,domain)] = self.insert_row(self.treemodel, self.zc_ifaces[(interface,protocol)], domain,None,interface,protocol,None,domain) - if self.zc_types.has_key((interface,protocol,stype,domain)) == False: - thisDomain = self.zc_domains[(interface,protocol,domain)] - self.zc_types[(interface,protocol,stype,domain)] = self.insert_row(self.treemodel, thisDomain, self.lookup_type(stype), name, interface,None,None,None) - treeiter = self.insert_row(self.treemodel,self.zc_types[(interface,protocol,stype,domain)], name, name, interface,protocol,stype,domain) - self.services_browsed[(interface, protocol, name, stype, domain)] = treeiter - # expand the tree of this path - self.tree_view.expand_to_path(self.treemodel.get_path(treeiter)) - - def remove_service(self, interface, protocol, name, stype, domain, flags): - print "Service '%s' of type '%s' in domain '%s' on %i.%i disappeared." % (name, stype, domain, interface, protocol) - self.info_label.set_markup("") - treeiter=self.services_browsed[(interface, protocol, name, stype, domain)] - parent = self.treemodel.iter_parent(treeiter) - self.treemodel.remove(treeiter) - del self.services_browsed[(interface, protocol, name, stype, domain)] - if self.treemodel.iter_has_child(parent) == False: - treeiter=self.zc_types[(interface,protocol,stype,domain)] - parent = self.treemodel.iter_parent(treeiter) - self.treemodel.remove(treeiter) - del self.zc_types[(interface,protocol,stype,domain)] - if self.treemodel.iter_has_child(parent) == False: - treeiter=self.zc_domains[(interface,protocol,domain)] - parent = self.treemodel.iter_parent(treeiter) - self.treemodel.remove(treeiter) - del self.zc_domains[(interface,protocol,domain)] - if self.treemodel.iter_has_child(parent) == False: - treeiter=self.zc_ifaces[(interface,protocol)] - parent = self.treemodel.iter_parent(treeiter) - self.treemodel.remove(treeiter) - del self.zc_ifaces[(interface,protocol)] - - def new_service_type(self, interface, protocol, stype, domain, flags): - global service_browsers - - # Are we already browsing this domain for this type? - if service_browsers.has_key((interface, protocol, stype, domain)): - return - - print "Browsing for services of type '%s' in domain '%s' on %i.%i ..." % (stype, domain, interface, protocol) - - b = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceBrowserNew(interface, protocol, stype, domain, dbus.UInt32(0))), avahi.DBUS_INTERFACE_SERVICE_BROWSER) - b.connect_to_signal('ItemNew', self.new_service) - b.connect_to_signal('ItemRemove', self.remove_service) - - service_browsers[(interface, protocol, stype, domain)] = b - - def browse_domain(self, interface, protocol, domain): - global service_type_browsers - - # Are we already browsing this domain? - if service_type_browsers.has_key((interface, protocol, domain)): - return - - if self.stype is None: - print "Browsing domain '%s' on %i.%i ..." % (domain, interface, protocol) - - 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 - else: - new_service_type(interface, protocol, stype, domain) - - def new_domain(self,interface, protocol, domain, flags): - if self.zc_ifaces.has_key((interface,protocol)) == False: - ifn = self.get_interface_name(interface, protocol) - self.zc_ifaces[(interface,protocol)] = self.insert_row(self.treemodel, None, ifn,None,interface,protocol,None,domain) - if self.zc_domains.has_key((interface,protocol,domain)) == False: - self.zc_domains[(interface,protocol,domain)] = self.insert_row(self.treemodel, self.zc_ifaces[(interface,protocol)], domain,None,interface,protocol,None,domain) - if domain != "local": - self.browse_domain(interface, protocol, domain) - - def pair_to_dict(self, l): - res = dict() - for el in l: - if "=" not in el: - res[el]='' - else: - tmp = el.split('=',1) - if len(tmp[0]) > 0: - res[tmp[0]] = tmp[1] - return res - - - def update_label(self,interface, protocol, name, stype, domain, host, aprotocol, address, port, txt): - if len(txt) != 0: - txts = "" - txtd = self.pair_to_dict(txt) - for k,v in txtd.items(): - txts+="TXT %s = %s\n" % (k,v) - else: - txts = "TXT Data: empty" - - infos = "Service Type: %s\nService Name: %s\nDomain Name: %s\nInterface: %s %s\nAddress: %s/%s:%i\n%s" % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip()) - self.info_label.set_markup(infos) - - def insert_row(self, model,parent, - content, name, interface,protocol,stype,domain): - myiter=model.insert_after(parent,None) - model.set(myiter,0,content,1,name,2,interface,3,protocol,4,stype,5,domain) - return myiter - - def new(self): - self.treemodel=gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) - self.tree_view.set_model(self.treemodel) - - #creating the columns headers - self.tree_view.set_headers_visible(False) - renderer=gtk.CellRendererText() - column=gtk.TreeViewColumn("",renderer, text=0) - column.set_resizable(True) - column.set_sizing("GTK_TREE_VIEW_COLUMN_GROW_ONLY"); - column.set_expand(True); - self.tree_view.append_column(column) - - self.domain = None - self.stype = None - self.zc_ifaces = {} - self.zc_domains = {} - self.zc_types = {} - self.services_browsed = {} - - try: - self.bus = dbus.SystemBus() - self.server = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) - except Exception, e: - print "Failed to connect to Avahi Server (Is it running?): %s" % e - sys.exit(1) - - if self.domain is None: - # Explicitly browse .local - self.browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") - - # Browse for other browsable domains - db = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0))), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) - db.connect_to_signal('ItemNew', self.new_domain) - else: - # Just browse the domain the user wants us to browse - self.browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, domain) - - def gtk_main_quit(self, *args): - gtk.main_quit() - -def main(): - main_window = Main_window() - gtk.main() - -if __name__ == "__main__": - main() diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py new file mode 100755 index 0000000..cea1ff9 --- /dev/null +++ b/avahi-python/avahi-discover/avahi-discover.py @@ -0,0 +1,288 @@ +#!@PYTHON@ +# -*-python-*- +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +import os, sys + +try: + import avahi, gettext, gtk, gobject, dbus, avahi.ServiceTypeDatabase + gettext.bindtextdomain(@GETTEXT_PACKAGE@, @LOCALEDIR@) + gettext.textdomain(@GETTEXT_PACKAGE@) + _ = gettext.gettext +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) +except Exception, e: + print "Failed to initialize: %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 + +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() + +ui_dir = "@interfacesdir@" + +service_type_db = avahi.ServiceTypeDatabase.ServiceTypeDatabase() + +class Main_window: + def __init__(self, path="avahi-discover.ui", root="main_window", domain=None, **kwargs): + path = os.path.join(ui_dir, path) + gtk.window_set_default_icon_name("network-wired") + self.ui = gtk.Builder() + self.ui.add_from_file(path) + self.ui.connect_signals(self) + self.tree_view = self.ui.get_object("tree_view") + self.info_label = self.ui.get_object("info_label") + self.new() + + def on_tree_view_cursor_changed(self, widget, *args): + (model, iter) = widget.get_selection().get_selected() + stype = None + if iter is not None: + (name,interface,protocol,stype,domain) = self.treemodel.get(iter,1,2,3,4,5) + if stype == None: + self.info_label.set_markup(_("No service currently selected.")) + return + #Asynchronous resolving + self.server.ResolveService( int(interface), int(protocol), name, stype, domain, avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved, error_handler=self.print_error) + + def protoname(self,protocol): + if protocol == avahi.PROTO_INET: + return "IPv4" + if protocol == avahi.PROTO_INET6: + return "IPv6" + return "n/a" + + def siocgifname(self, interface): + if interface <= 0: + return "n/a" + else: + return self.server.GetNetworkInterfaceNameByIndex(interface) + + def get_interface_name(self, interface, protocol): + if interface == avahi.IF_UNSPEC and protocol == avahi.PROTO_UNSPEC: + return "Wide Area" + else: + return str(self.siocgifname(interface)) + " " + str(self.protoname(protocol)) + + def service_resolved(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): + print "Service data for service '%s' of type '%s' in domain '%s' on %i.%i:" % (name, stype, domain, interface, protocol) + + print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, str(avahi.txt_array_to_string_array(txt))) + + self.update_label(interface, protocol, name, stype, domain, host, aprotocol, address, port, avahi.txt_array_to_string_array(txt)) + + def print_error(self, err): + error_label = "Error: %s" % (err) + self.info_label.set_markup(error_label) + print "Error:", str(err) + + def lookup_type(self, stype): + global service_type_db + + try: + return service_type_db[stype] + except KeyError: + return stype + + def new_service(self, interface, protocol, name, stype, domain, flags): + print "Found service '%s' of type '%s' in domain '%s' on %i.%i." % (name, stype, domain, interface, protocol) + if self.zc_ifaces.has_key((interface,protocol)) == False: + + ifn = self.get_interface_name(interface, protocol) + + self.zc_ifaces[(interface,protocol)] = self.insert_row(self.treemodel, None, ifn, None,interface,protocol,None,domain) + if self.zc_domains.has_key((interface,protocol,domain)) == False: + self.zc_domains[(interface,protocol,domain)] = self.insert_row(self.treemodel, self.zc_ifaces[(interface,protocol)], domain,None,interface,protocol,None,domain) + if self.zc_types.has_key((interface,protocol,stype,domain)) == False: + thisDomain = self.zc_domains[(interface,protocol,domain)] + self.zc_types[(interface,protocol,stype,domain)] = self.insert_row(self.treemodel, thisDomain, self.lookup_type(stype), name, interface,None,None,None) + treeiter = self.insert_row(self.treemodel,self.zc_types[(interface,protocol,stype,domain)], name, name, interface,protocol,stype,domain) + self.services_browsed[(interface, protocol, name, stype, domain)] = treeiter + # expand the tree of this path + self.tree_view.expand_to_path(self.treemodel.get_path(treeiter)) + + def remove_service(self, interface, protocol, name, stype, domain, flags): + print "Service '%s' of type '%s' in domain '%s' on %i.%i disappeared." % (name, stype, domain, interface, protocol) + self.info_label.set_markup("") + treeiter=self.services_browsed[(interface, protocol, name, stype, domain)] + parent = self.treemodel.iter_parent(treeiter) + self.treemodel.remove(treeiter) + del self.services_browsed[(interface, protocol, name, stype, domain)] + if self.treemodel.iter_has_child(parent) == False: + treeiter=self.zc_types[(interface,protocol,stype,domain)] + parent = self.treemodel.iter_parent(treeiter) + self.treemodel.remove(treeiter) + del self.zc_types[(interface,protocol,stype,domain)] + if self.treemodel.iter_has_child(parent) == False: + treeiter=self.zc_domains[(interface,protocol,domain)] + parent = self.treemodel.iter_parent(treeiter) + self.treemodel.remove(treeiter) + del self.zc_domains[(interface,protocol,domain)] + if self.treemodel.iter_has_child(parent) == False: + treeiter=self.zc_ifaces[(interface,protocol)] + parent = self.treemodel.iter_parent(treeiter) + self.treemodel.remove(treeiter) + del self.zc_ifaces[(interface,protocol)] + + def new_service_type(self, interface, protocol, stype, domain, flags): + global service_browsers + + # Are we already browsing this domain for this type? + if service_browsers.has_key((interface, protocol, stype, domain)): + return + + print "Browsing for services of type '%s' in domain '%s' on %i.%i ..." % (stype, domain, interface, protocol) + + b = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceBrowserNew(interface, protocol, stype, domain, dbus.UInt32(0))), avahi.DBUS_INTERFACE_SERVICE_BROWSER) + b.connect_to_signal('ItemNew', self.new_service) + b.connect_to_signal('ItemRemove', self.remove_service) + + service_browsers[(interface, protocol, stype, domain)] = b + + def browse_domain(self, interface, protocol, domain): + global service_type_browsers + + # Are we already browsing this domain? + if service_type_browsers.has_key((interface, protocol, domain)): + return + + if self.stype is None: + print "Browsing domain '%s' on %i.%i ..." % (domain, interface, protocol) + + 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 + else: + new_service_type(interface, protocol, stype, domain) + + def new_domain(self,interface, protocol, domain, flags): + if self.zc_ifaces.has_key((interface,protocol)) == False: + ifn = self.get_interface_name(interface, protocol) + self.zc_ifaces[(interface,protocol)] = self.insert_row(self.treemodel, None, ifn,None,interface,protocol,None,domain) + if self.zc_domains.has_key((interface,protocol,domain)) == False: + self.zc_domains[(interface,protocol,domain)] = self.insert_row(self.treemodel, self.zc_ifaces[(interface,protocol)], domain,None,interface,protocol,None,domain) + if domain != "local": + self.browse_domain(interface, protocol, domain) + + def pair_to_dict(self, l): + res = dict() + for el in l: + if "=" not in el: + res[el]='' + else: + tmp = el.split('=',1) + if len(tmp[0]) > 0: + res[tmp[0]] = tmp[1] + return res + + + def update_label(self,interface, protocol, name, stype, domain, host, aprotocol, address, port, txt): + if len(txt) != 0: + txts = "" + txtd = self.pair_to_dict(txt) + for k,v in txtd.items(): + txts+="" + _("TXT") + " %s = %s\n" % (k,v) + else: + txts = "" + _("TXT Data:") + " " + _("empty") + "" + + infos = "" + _("Service Type:") + " %s\n" + infos += "" + _("Service Name:") + " %s\n" + infos += "" + _("Domain Name:") + " %s\n" + infos += "" + _("Interface:") + " %s %s\n" + infos += "" + _("Address:") + " %s/%s:%i\n%s" + infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip()) + self.info_label.set_markup(infos) + + def insert_row(self, model,parent, + content, name, interface,protocol,stype,domain): + myiter=model.insert_after(parent,None) + model.set(myiter,0,content,1,name,2,interface,3,protocol,4,stype,5,domain) + return myiter + + def new(self): + self.treemodel=gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) + self.tree_view.set_model(self.treemodel) + + #creating the columns headers + self.tree_view.set_headers_visible(False) + renderer=gtk.CellRendererText() + column=gtk.TreeViewColumn("",renderer, text=0) + column.set_resizable(True) + column.set_sizing("GTK_TREE_VIEW_COLUMN_GROW_ONLY"); + column.set_expand(True); + self.tree_view.append_column(column) + + self.domain = None + self.stype = None + self.zc_ifaces = {} + self.zc_domains = {} + self.zc_types = {} + self.services_browsed = {} + + try: + self.bus = dbus.SystemBus() + self.server = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) + except Exception, e: + print "Failed to connect to Avahi Server (Is it running?): %s" % e + sys.exit(1) + + if self.domain is None: + # Explicitly browse .local + self.browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") + + # Browse for other browsable domains + db = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0))), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) + db.connect_to_signal('ItemNew', self.new_domain) + else: + # Just browse the domain the user wants us to browse + self.browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, domain) + + def gtk_main_quit(self, *args): + gtk.main_quit() + +def main(): + main_window = Main_window() + gtk.main() + +if __name__ == "__main__": + main() diff --git a/po/POTFILES.in b/po/POTFILES.in index 9e9a0cc..ea5f64d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,7 @@ avahi-common/error.c [type: gettext/glade]avahi-discover-standalone/avahi-discover.ui avahi-python/avahi-discover/avahi-discover.desktop.in.in +avahi-python/avahi-discover/avahi-discover.py avahi-ui/avahi-ui.c avahi-ui/bssh.c avahi-ui/bssh.desktop.in.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip index ce6337d..7ee0ef4 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,4 +2,3 @@ avahi-ui/bssh.desktop.in avahi-ui/bvnc.desktop.in tests/c-plus-plus-test-gen.py avahi-python/avahi-discover/avahi-discover.desktop.in -avahi-python/avahi-discover/avahi-discover.desktop.in