# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1268698881 0
# Node ID 04a43f5d33368999d541693a0c3293d1a13ec7c1
# Parent  ffc9d2c92c8327c67f555550e5278fdb85228b89# Parent  d5de7ba3f80fc631c02efee7a26acf29702de12d
Merge from mainline.

diff -r ffc9d2c92c83 -r 04a43f5d3336 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 15 22:14:49 2010 +0000
+++ b/lisp/ChangeLog	Tue Mar 16 00:21:21 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/secrets.el (top): Register the D-Bus signals only when the
+	service "org.freedesktop.secrets" can be pinged.  Provide
+	subfeature 'enabled.
+
 2010-03-14  Juri Linkov  <juri@jurta.org>
 
 	Add finder unknown keywords.
diff -r ffc9d2c92c83 -r 04a43f5d3336 lisp/net/secrets.el
--- a/lisp/net/secrets.el	Mon Mar 15 22:14:49 2010 +0000
+++ b/lisp/net/secrets.el	Tue Mar 16 00:21:21 2010 +0000
@@ -32,8 +32,13 @@
 
 ;; In order to activate this package, you must add the following code
 ;; into your .emacs:
+;;
+;;   (require 'secrets)
 
-;;   (require 'secrets)
+;; It can be checked afterwards, whether there is a daemon providing
+;; this interface:
+;;
+;;   (featurep 'secrets 'enabled)
 
 ;; The atomic objects to be managed by the Secret Service API are
 ;; secret items, which are something an application wishes to store
@@ -383,14 +388,6 @@
     (setq secrets-collection-paths
 	  (delete (car args) secrets-collection-paths)))))
 
-(dbus-register-signal
- :session secrets-service secrets-path
- secrets-interface-service "CollectionCreated" 'secrets-collection-handler)
-
-(dbus-register-signal
- :session secrets-service secrets-path
- secrets-interface-service "CollectionDeleted" 'secrets-collection-handler)
-
 (defun secrets-get-collections ()
   "Return the object paths of all available collections."
   (setq secrets-collection-paths
@@ -667,20 +664,38 @@
 	:session secrets-service item-path
 	secrets-interface-item "Delete")))))
 
-;; We must reset all variables, when there is a new instance of the
-;; "org.freedesktop.secrets" service.
+(if (dbus-ping :session secrets-service 100)
+
+    (progn
+      ;; We must reset all variables, when there is a new instance of
+      ;; the "org.freedesktop.secrets" service.
+      (dbus-register-signal
+       :session dbus-service-dbus dbus-path-dbus
+       dbus-interface-dbus "NameOwnerChanged"
+       (lambda (&rest args)
+	 (when secrets-debug (message "Secret Service has changed: %S" args))
+	 (setq secrets-session-path secrets-empty-path
+	       secrets-prompt-signal nil
+	       secrets-collection-paths nil))
+       secrets-service)
 
-(dbus-register-signal
- :session dbus-service-dbus dbus-path-dbus
- dbus-interface-dbus "NameOwnerChanged"
- (lambda (&rest args)
-   (when secrets-debug (message "Secret Service has changed: %S" args))
-   (setq secrets-session-path secrets-empty-path
-	 secrets-prompt-signal nil
-	 secrets-collection-paths nil))
- secrets-service)
+      ;; We want to refresh our cache, when there is a change in
+      ;; collections.
+      (dbus-register-signal
+       :session secrets-service secrets-path
+       secrets-interface-service "CollectionCreated"
+       'secrets-collection-handler)
 
-(provide 'secrets)
+      (dbus-register-signal
+       :session secrets-service secrets-path
+       secrets-interface-service "CollectionDeleted"
+       'secrets-collection-handler)
+
+      ;; We shall inform, whether the secret service is enabled on
+      ;; this machine.
+      (provide 'secrets '(enabled)))
+
+  (provide 'secrets))
 
 ;;; TODO: