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

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/11/16 20:09:52

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

Log message:
        * net/tramp-gvfs.el (tramp-gvfs-dbus-event-error): Raise only an
        error when `tramp-gvfs-dbus-event-vector' is set.
        (tramp-gvfs-maybe-open-connection): Loop over `read-event'.

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

Patches:
Index: tramp-gvfs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-gvfs.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tramp-gvfs.el       7 Nov 2009 23:54:29 -0000       1.14
+++ tramp-gvfs.el       16 Nov 2009 20:09:52 -0000      1.15
@@ -499,9 +499,10 @@
 
 (defun tramp-gvfs-dbus-event-error (event err)
   "Called when a D-Bus error message arrives, see `dbus-event-error-hooks'."
-;  (tramp-cleanup-connection tramp-gvfs-dbus-event-vector)
-  (tramp-message tramp-gvfs-dbus-event-vector 1 "%S" event)
-  (tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err)))
+  (when tramp-gvfs-dbus-event-vector
+    ;(tramp-cleanup-connection tramp-gvfs-dbus-event-vector)
+    (tramp-message tramp-gvfs-dbus-event-vector 10 "%S" event)
+    (tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err))))
 
 (add-hook 'dbus-event-error-hooks 'tramp-gvfs-dbus-event-error)
 
@@ -1092,7 +1093,7 @@
              vec 'file-error
              "Timeout reached mounting address@hidden using %s" user host 
method)))
        (while (not (tramp-get-file-property vec "/" "fuse-mountpoint" nil))
-         (sit-for 0.1)))
+         (read-event nil nil 0.1)))
 
       ;; We set the connection property "started" in order to put the
       ;; remote location into the cache, which is helpful for further