Mercurial > emacs
changeset 107400:04a43f5d3336
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 16 Mar 2010 00:21:21 +0000 |
| parents | ffc9d2c92c83 (current diff) d5de7ba3f80f (diff) |
| children | f5130b7f5581 |
| files | |
| diffstat | 2 files changed, 42 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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: