From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 16 Nov 2009 20:10:39 +0000 (+0000)
Subject: * net/tramp-gvfs.el (tramp-gvfs-dbus-event-error): Raise only an
X-Git-Tag: emacs-pretest-23.1.90~395
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3e971853d5d29230315e08421a3ccd6870886b3;p=emacs.git

* 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'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a77408c604c..fe04aeec167 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	* vc-rcs.el (vc-rcs-consult-headers): Add missing save-excursion.
@@ -5,7 +11,7 @@
 2009-11-16  Michael Albinus  <michael.albinus@gmx.de>
 
 	* 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.
 	(dbus-property-handler): Fix docstring.
 
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 94f6f742017..a04f891b3f5 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -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 @@ is no information where to trace the message.")
 
 (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 @@ connection if a previous connection has died for some reason."
 	      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