Commit d3e97185 authored by Michael Albinus's avatar Michael Albinus
Browse files

* 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'.
parent 11814156
2009-11-16 Michael Albinus <michael.albinus@gmx.de>
* 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'.
2009-11-16 Stefan Monnier <monnier@iro.umontreal.ca> 2009-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-rcs.el (vc-rcs-consult-headers): Add missing save-excursion. * vc-rcs.el (vc-rcs-consult-headers): Add missing save-excursion.
...@@ -5,7 +11,7 @@ ...@@ -5,7 +11,7 @@
2009-11-16 Michael Albinus <michael.albinus@gmx.de> 2009-11-16 Michael Albinus <michael.albinus@gmx.de>
* net/dbus.el (dbus-unregister-service): New defun. * net/dbus.el (dbus-unregister-service): New defun.
(dbus-register-property): Register the handlers for (dbus-register-property): Register the handlers of
"org.freedesktop.DBus.Properties" for SERVICE. "org.freedesktop.DBus.Properties" for SERVICE.
(dbus-property-handler): Fix docstring. (dbus-property-handler): Fix docstring.
......
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
;; <interface name='org.gtk.vfs.MountOperation'> ;; <interface name='org.gtk.vfs.MountOperation'>
;; <method name='askPassword'> ;; <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_user' type='s' direction='in'/>
;; <arg name='default_domain' type='s' direction='in'/> ;; <arg name='default_domain' type='s' direction='in'/>
;; <arg name='flags' type='u' direction='in'/> ;; <arg name='flags' type='u' direction='in'/>
...@@ -499,9 +499,10 @@ is no information where to trace the message.") ...@@ -499,9 +499,10 @@ is no information where to trace the message.")
(defun tramp-gvfs-dbus-event-error (event err) (defun tramp-gvfs-dbus-event-error (event err)
"Called when a D-Bus error message arrives, see `dbus-event-error-hooks'." "Called when a D-Bus error message arrives, see `dbus-event-error-hooks'."
; (tramp-cleanup-connection tramp-gvfs-dbus-event-vector) (when tramp-gvfs-dbus-event-vector
(tramp-message tramp-gvfs-dbus-event-vector 1 "%S" event) ;(tramp-cleanup-connection tramp-gvfs-dbus-event-vector)
(tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err))) (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) (add-hook 'dbus-event-error-hooks 'tramp-gvfs-dbus-event-error)
...@@ -1092,7 +1093,7 @@ connection if a previous connection has died for some reason." ...@@ -1092,7 +1093,7 @@ connection if a previous connection has died for some reason."
vec 'file-error vec 'file-error
"Timeout reached mounting %s@%s using %s" user host method))) "Timeout reached mounting %s@%s using %s" user host method)))
(while (not (tramp-get-file-property vec "/" "fuse-mountpoint" nil)) (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 ;; We set the connection property "started" in order to put the
;; remote location into the cache, which is helpful for further ;; remote location into the cache, which is helpful for further
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment