diff options
| -rw-r--r-- | services/presence/Service.py | 14 | ||||
| -rw-r--r-- | shell/view/frame/Makefile.am | 4 | ||||
| -rw-r--r-- | sugar/graphics/Makefile.am | 5 |
3 files changed, 12 insertions, 11 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() diff --git a/shell/view/frame/Makefile.am b/shell/view/frame/Makefile.am index 8d95114..01458cc 100644 --- a/shell/view/frame/Makefile.am +++ b/shell/view/frame/Makefile.am @@ -1,9 +1,9 @@ sugardir = $(pkgdatadir)/shell/view/frame sugar_PYTHON = \ __init__.py \ + ActivitiesBox.py \ RightPanel.py \ PanelWindow.py \ Frame.py \ - TopPanel.py \ - BottomPanel.py \ + ZoomBox.py \ MenuStrategy.py diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am index a5f8166..8ad8b8e 100644 --- a/sugar/graphics/Makefile.am +++ b/sugar/graphics/Makefile.am @@ -2,4 +2,7 @@ sugardir = $(pythondir)/sugar/graphics sugar_PYTHON = \ __init__.py \ canvasicon.py \ - grid.py + grid.py \ + menuicon.py \ + menu.py \ + style.py |