[Emacs-diffs] emacs/lisp/net tramp-gvfs.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/08/25 10:24:25

Modified files:
        lisp/net       : tramp-gvfs.el 

Log message:
        * 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)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp-gvfs.el?cvsroot=emacs&r1=1.11&r2=1.12

Patches:
Index: tramp-gvfs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-gvfs.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tramp-gvfs.el       4 Aug 2009 03:29:54 -0000       1.11
+++ tramp-gvfs.el       25 Aug 2009 10:24:25 -0000      1.12
@@ -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 "")))