Mercurial > emacs
changeset 106058:b6d8539323de
* 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'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 16 Nov 2009 20:09:52 +0000 |
| parents | 385ba537122c |
| children | 996d28557095 |
| files | lisp/net/tramp-gvfs.el |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp-gvfs.el Mon Nov 16 19:46:56 2009 +0000 +++ b/lisp/net/tramp-gvfs.el Mon Nov 16 20:09:52 2009 +0000 @@ -196,7 +196,7 @@ ;; <interface name='org.gtk.vfs.MountOperation'> ;; <method name='askPassword'> -;; <arg name='message' type='s' direction='in'/> +;; <arg name='message' type='s' direction='in'/> ;; <arg name='default_user' type='s' direction='in'/> ;; <arg name='default_domain' type='s' direction='in'/> ;; <arg name='flags' type='u' direction='in'/> @@ -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 %s@%s 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