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

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/07/02 15:27:21

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

Log message:
        * net/tramp-gvfs.el (tramp-gvfs-handler-mounted-unmounted)
        (tramp-gvfs-connection-mounted-p): Handle changed mount-info
        interface.

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

Patches:
Index: tramp-gvfs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-gvfs.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tramp-gvfs.el       1 Jul 2009 15:21:31 -0000       1.7
+++ tramp-gvfs.el       2 Jul 2009 15:27:21 -0000       1.8
@@ -869,7 +869,10 @@
 \"org.gtk.vfs.MountTracker.unmounted\" signals."
   (ignore-errors
     (let* ((signal-name (dbus-event-member-name last-input-event))
-          (mount-spec (nth 1 (nth 9 mount-info)))
+          ;; The interface of mount-info has been changed.  We must
+          ;; handle both cases.
+          (last-nth (if (nth 9 mount-info) 9 8))
+          (mount-spec (nth 1 (nth last-nth mount-info)))
           (method (dbus-byte-array-to-string (cadr (assoc "type" mount-spec))))
           (user (dbus-byte-array-to-string (cadr (assoc "user" mount-spec))))
           (domain (dbus-byte-array-to-string
@@ -898,7 +901,7 @@
          (tramp-set-file-property
           v "/" "fuse-mountpoint"
           (file-name-nondirectory
-           (dbus-byte-array-to-string (nth 8 mount-info)))))))))
+           (dbus-byte-array-to-string (nth (1- last-nth) mount-info)))))))))
 
 (dbus-register-signal
  :session nil tramp-gvfs-path-mounttracker
@@ -920,7 +923,10 @@
             :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
             tramp-gvfs-interface-mounttracker "listMounts"))
         nil)
-      (let* ((mount-spec (nth 1 (nth 9 elt)))
+      ;; The interface of mount-info has been changed.  We must handle
+      ;; both cases.
+      (let* ((last-nth (if (nth 9 mount-info) 9 8))
+            (mount-spec (nth 1 (nth last-nth elt)))
             (method (dbus-byte-array-to-string
                      (cadr (assoc "type" mount-spec))))
             (user (dbus-byte-array-to-string
@@ -950,7 +956,8 @@
               (string-equal host (tramp-file-name-host vec)))
          (tramp-set-file-property
           vec "/" "fuse-mountpoint"
-          (file-name-nondirectory (dbus-byte-array-to-string (nth 8 elt))))
+          (file-name-nondirectory
+           (dbus-byte-array-to-string (nth (1- last-nth) elt))))
          (throw 'mounted t))))))
 
 (defun tramp-gvfs-mount-spec (vec)