Bazaar/Avahi Plugin

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

  1. trunk
  2. Merge into devel
Proposed by welterde
Status: Needs review
Proposed branch: lp:~welterde/bzr-avahi/trunk
Merge into: lp:bzr-avahi
Diff against target: 24 lines (+3/-3)
1 file modified
__init__.py (+3/-3)
To merge this branch: bzr merge lp:~welterde/bzr-avahi/trunk
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
James Henstridge Pending
Review via email: mp+14862@code.launchpad.net
To post a comment you must log in.
Revision history for this message
welterde (welterde) wrote :

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

Reply
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

James, ping?

review: Approve (code)
Reply

Unmerged revisions

37. By welterde

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2008-05-12 02:03:47 +0000
3+++ __init__.py 2009-11-14 14:10:24 +0000
4@@ -33,7 +33,7 @@
5 from bzrlib.commands import Command, Option, display_command, register_command
6 from bzrlib.directory_service import directories
7 from bzrlib.lazy_import import lazy_import
8-from bzrlib.plugins.dbus.server_mainloop import MainloopThread
9+from bzrlib.smart.server import SmartTCPServer
10 lazy_import(globals(), """
11 import os
12
13@@ -70,9 +70,9 @@
14 global_advertiser.remove_server(server_url)
15 pass
16
17-MainloopThread.hooks.install_named_hook(
18+SmartTCPServer.hooks.install_named_hook(
19 'server_started', server_started, 'Advertising branches via mDNS')
20-MainloopThread.hooks.install_named_hook(
21+SmartTCPServer.hooks.install_named_hook(
22 'server_stopped', server_stopped, 'Stop advertising branches via mDNS')
23
24 # Register local: transport.

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: