The attached bundle alters bzr-gtk's commit-notify command to listen
for D-Bus "Revision" signals from any source, rather than just the
broadcast daemon.
This is necessary for it to continue working with my bzr-dbus patches
that remove the broadcast daemon (see bug #194251).
Since this change makes commit-notify listen for the signal from all
sources, it functions correctly with existing bzr-dbus versions too,
so there is no need to wait for the bzr-dbus change to merge before
this branch does. In fact, merging this branch first would probably
make things easier :)
James.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: bzr+ssh://bazaar.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# testament_sha1: a0b29a7b3ebe59a7b11e7e1169ea40a4c339edf2
# timestamp: 2008-04-01 14:06:30 +0800
# base_revision_id: [EMAIL PROTECTED]
# 6wykjegcfh6y08wi
#
# Begin patch
=== modified file '__init__.py'
--- __init__.py 2008-03-12 15:20:01 +0000
+++ __init__.py 2008-03-25 09:37:23 +0000
@@ -527,12 +527,8 @@
from bzrlib.transport import get_transport
if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
import dbus.glib
- from bzrlib.plugins.dbus import activity
+ BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
bus = dbus.SessionBus()
- # get the object so we can subscribe to callbacks from it.
- broadcast_service = bus.get_object(
- activity.Broadcast.DBUS_NAME,
- activity.Broadcast.DBUS_PATH)
def catch_branch(revision_id, urls):
# TODO: show all the urls, or perhaps choose the 'best'.
@@ -569,8 +565,9 @@
except Exception, e:
print e
raise
- broadcast_service.connect_to_signal("Revision", catch_branch,
- dbus_interface=activity.Broadcast.DBUS_INTERFACE)
+ bus.add_signal_receiver(catch_branch,
+ dbus_interface=BROADCAST_INTERFACE,
+ signal_name="Revision")
pynotify.init("bzr commit-notify")
gtk.main()
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbs4BWwAAf9/gCQQAARRb///
f///EL////BQBRh4AMDtpVAdISkJqYin6TYUNT2UwA0QyanlPQaHpT0xBNlA1Qhpkep6TBANNAGa
gAANGQAxAaJomhqZT8qbU8SPUeo0NAaAAADR6Ro0HGTJoxDE0wEDAmmCMExNNNABhBKEEAExGQTV
PxqmNU2aUG1HpPUbU0NBoyDgTBPB9FgdPkzFVWuOSgMfXjqmKMGTDtc6Nd8oiDTBRWWJonNY1UD0
gWXOoEGgQh5OlqHjgMGZXe5JdmU0wFqUTzsNMd7Fm4haKV9hU6CYZIHA1Ky0YJ8iSNYy5iTyp8mH
RxXLC5FA+qZrK8HIoS4VbFh2SWkSI5CAr/DFBwz3stVvQQFTrS43oUgWB2lZcs+JgBnsjK7uhA4I
HV/lga4UoC/FIaz+d3K2dvJDbIWKaDozlR97gdf0AO2WLgkQTvOPOeJAjkOQSSwPUByKinGS0Xs/
C5EsV+pjpY18a1u1FgWWnmYVhxKfq5VErKTleX9jzICEnNES4LTICd0TAYBiRjAkQ/qggQtnfeBN
ElDBsIqFSgONstEj2oXSBdTFzvACmrVQxSGgZhw5rRxcQygWpkfJ1clTnGgwgtAGWkq0xFSYXkik
BtRQ6i9izVQDkwNT3pMTFSe+UeSPO7YHYFeiTHUPAaUYpNeoeHO4mcfMxffO1yCRG3FhS4YqxV5E
m8PHeUbVC5IjAbZ9p8bQcVYGpHEpAleX0Ep9Ouq6calKdJpSYIwJ0IdDcmaieSj9lOa3kp1sVhUS
xb9+ggyMasdUtjAzOIGHaX/g+sO41mG9DzIKTzHKPK35TdlI0HvAvW6zUXWjYSH0VC9lItR8yun1
sgrHwnBxP90rt2c3GOk4khtMXHm2ddW7Tz6Z5CAx9C2Cq5qWm6mnL26pbk828qjg/+cEzAbYP7hF
jRrMA/b8biOHekFtVfu0o6mhiFA4xup/vVF5jUPYpms26T+EZjNp2km9PsGcC8cN+6MyFEdcsG5D
19FWShQWeOcQF2ninjmIRFIGeUgRVJ0ipwGs1MVwyVCxSBk54IQDTlNbVHU8u4gOss3gUSxzYRFs
DyfkFx1cOUjR1IaFX8v4fBA7y9T4GBoK03jEQ3lUaPoc9U7L2WL7fB5pk6cXurRHMt5J5MOXNztR
/8ErxaKj0HlXVJXtaqsf3g+3Aq77Zw4JMJU27CWdeP6awoyhEcCDLR6CgODEH6pwMMiTFxmPM1Bx
SOMQ+b979AWliXx4ZBLyc6IgsWUTFppByn7ppCwgVwV4MGQel6u8+AEMg/6Le3Ey6IFniD5UhzmM
RT5Uhlejh1SoVoE7VZ7NxrtQEq9aITzkSRruut2cfVKngi8CBIEkOG1cV1lOKHIMAM+u6Ieko9Jw
pc3aN3gc7Ts4gXeInr451QT2UoiGzPQfQlCaSPcWAUSRjFkApTZEZwPIoMvMcyMLIKqIqiebA/eB
fl8PbgHACUuUVQcCgofcqH2TTIertcGeqCW38zO7rty3btwZwJw2geH5gWxmmFgmmT3Tad7b22DM
jkMzQ6o4kRK+hGxUdJMsmtyHoNunAheEkiiqPZG7ODFabuI6gUQe3UZbZgIoFDi+su/FmdWhyUR/
zqCM5PWrDXEHnBj7zFCIYnxBC1gwIoKmauYmhr0C3OBhA6MLHUIORVSKhNK47GQH+ynEqmqr2hzm
5AWSVvSzBEOARLeYe/Kz13gTBXVfdZvSIQpB4EYvyzQ83vK+JaR/i7kinChIXZwCtgA=
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
