diff options
| author | Dan Williams <dcbw@localhost.localdomain> | 2006-10-02 21:11:20 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@localhost.localdomain> | 2006-10-02 21:11:20 (GMT) |
| commit | 3919643c7dc0f22f6d4068b6b229d654d55b8b4f (patch) | |
| tree | a96a363f05040b4c9f1768ba4cd0a9d555944ab9 /services | |
| parent | 3524042ad75063743227cad8fcbeae932610f80c (diff) | |
Expose local name collision errors (ie, somebody else registered that service)
Diffstat (limited to 'services')
| -rw-r--r-- | services/presence/Service.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/services/presence/Service.py b/services/presence/Service.py index 2f0e22f..1057071 100644 --- a/services/presence/Service.py +++ b/services/presence/Service.py @@ -397,14 +397,12 @@ class Service(gobject.GObject): logging.debug("Will register service with name='%s', stype='%s'," \ " domain='%s', address='%s', port=%d, info='%s'" % (self._full_name, self._stype, self._domain, self._address, self._port, info)) - try: - self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, - dbus.String(self._full_name), dbus.String(self._stype), - dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out - dbus.UInt16(self._port), info) - except dbus.DBusException, exc: - # Local name collision and stuff - pass + + self._avahi_entry_group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, + dbus.String(self._full_name), dbus.String(self._stype), + dbus.String(self._domain), dbus.String(""), # let Avahi figure the 'host' out + dbus.UInt16(self._port), info) + self._avahi_entry_group.connect_to_signal('StateChanged', self.__entry_group_changed_cb) self._avahi_entry_group.Commit() |