Mercurial > emacs
changeset 104603:d52f81521f32
* net/tramp-gvfs.el (top): Use timeout of 100 msec pinging GVFS
daemon. Replace ping by checking for running service for bluez
and zeroconf. (Bug#4239)
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Tue, 25 Aug 2009 10:24:25 +0000 |
| parents | d74b934b16e5 |
| children | c321af690274 |
| files | lisp/net/tramp-gvfs.el |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp-gvfs.el Tue Aug 25 10:13:54 2009 +0000 +++ b/lisp/net/tramp-gvfs.el Tue Aug 25 10:24:25 2009 +0000 @@ -144,7 +144,7 @@ "The well known name of the GVFS daemon.") ;; Check that GVFS is available. -(unless (dbus-ping :session tramp-gvfs-service-daemon) +(unless (dbus-ping :session tramp-gvfs-service-daemon 100) (throw 'tramp-loading nil)) (defconst tramp-gvfs-path-mounttracker "/org/gtk/vfs/mounttracker" @@ -1177,7 +1177,7 @@ (tramp-bluez-list-devices))) ;; Add completion function for OBEX method. -(when (dbus-ping :system tramp-bluez-service) +(when (member tramp-bluez-service (dbus-list-known-names :system)) (tramp-set-completion-function "obex" '((tramp-bluez-parse-device-names "")))) @@ -1210,7 +1210,7 @@ (zeroconf-list-services "_webdav._tcp"))) ;; Add completion function for DAV and DAVS methods. -(when (dbus-ping :system zeroconf-service-avahi) +(when (member zeroconf-service-avahi (dbus-list-known-names :system)) (zeroconf-init tramp-gvfs-zeroconf-domain) (tramp-set-completion-function "sftp" '((tramp-zeroconf-parse-workstation-device-names "")))