Merge lp:~welterde/bzr-avahi/trunk into lp:bzr-avahi

[welterde]

[welterde (welterde)]

fixes bzr-avahi on a more recent version of bzr-dbus/bzr

[Jelmer Vernooij (jelmer)]

James, ping?

review: Approve (code)

Unmerged revisions

37. By welterde on 2009-11-14

the dbus-plugin doesn't contain that (anymore)

=== modified file '__init__.py'
--- __init__.py	2008-05-12 02:03:47 +0000
+++ __init__.py	2009-11-14 14:10:24 +0000
@@ -33,7 +33,7 @@
 from bzrlib.commands import Command, Option, display_command, register_command
 from bzrlib.directory_service import directories
 from bzrlib.lazy_import import lazy_import
-from bzrlib.plugins.dbus.server_mainloop import MainloopThread
+from bzrlib.smart.server import SmartTCPServer
 lazy_import(globals(), """
 import os
 
@@ -70,9 +70,9 @@
     global_advertiser.remove_server(server_url)
     pass
 
-MainloopThread.hooks.install_named_hook(
+SmartTCPServer.hooks.install_named_hook(
     'server_started', server_started, 'Advertising branches via mDNS')
-MainloopThread.hooks.install_named_hook(
+SmartTCPServer.hooks.install_named_hook(
     'server_stopped', server_stopped, 'Stop advertising branches via mDNS')
 
 # Register local: transport.