2 files changed, 14 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd535eafafa..7d198ddd5d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * 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  <vincentb1@users.sourceforge.net>
 
         * ses.el (macroexp): add require for this package, so that
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 569fb684144..1b4c1694a92 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -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.")
 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.")