[Emacs-diffs] trunk r118198: * net/tramp-gvfs.el (tramp-gvfs-methods-mounttracker)

[Michael Albinus]

------------------------------------------------------------
revno: 118198
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18774
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2014-10-25 15:29:15 +0200
message:
  * net/tramp-gvfs.el (tramp-gvfs-methods-mounttracker)
  (tramp-gvfs-mountlocation-signature): Check `tramp-gvfs-enabled'
  during initialization.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-gvfs.el         
trampgvfs.el-20091113204419-o5vbwnq5f7feedwu-10898

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-25 10:40:14 +0000
+++ b/lisp/ChangeLog    2014-10-25 13:29:15 +0000
@@ -1,3 +1,9 @@
+2014-10-25  Michael Albinus  <address@hidden>
+
+       * net/tramp-gvfs.el (tramp-gvfs-methods-mounttracker)
+       (tramp-gvfs-mountlocation-signature): Check `tramp-gvfs-enabled'
+       during initialization.  (Bug#18774)
+
 2014-10-25  Vincent Belaïche  <address@hidden>
 
        * ses.el (macroexp): add require for this package, so that

=== modified file 'lisp/net/tramp-gvfs.el'
--- a/lisp/net/tramp-gvfs.el    2014-09-14 09:00:11 +0000
+++ b/lisp/net/tramp-gvfs.el    2014-10-25 13:29:15 +0000
@@ -167,9 +167,10 @@
 ;; Introspection data exist since GVFS 1.14.  If there are no such
 ;; data, we expect an earlier interface.
 (defconst tramp-gvfs-methods-mounttracker
-  (dbus-introspect-get-method-names
-   :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
-   tramp-gvfs-interface-mounttracker)
+  (and tramp-gvfs-enabled
+       (dbus-introspect-get-method-names
+       :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
+       tramp-gvfs-interface-mounttracker))
   "The list of supported methods of the mount tracking interface.")
 
 (defconst tramp-gvfs-listmounts
@@ -187,9 +188,10 @@
 It has been changed in GVFS 1.14.")
 
 (defconst tramp-gvfs-mountlocation-signature
-  (dbus-introspect-get-signature
-   :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
-   tramp-gvfs-interface-mounttracker tramp-gvfs-mountlocation)
+  (and tramp-gvfs-enabled
+       (dbus-introspect-get-signature
+       :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
+       tramp-gvfs-interface-mounttracker tramp-gvfs-mountlocation))
   "The D-Bus signature of the \"mountLocation\" method.
 It has been changed in GVFS 1.14.")