From 3919643c7dc0f22f6d4068b6b229d654d55b8b4f Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Mon, 02 Oct 2006 21:11:20 +0000
Subject: Expose local name collision errors (ie, somebody else registered that service)

---
(limited to 'services')

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()
 
--
cgit v0.9.1