aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-12-27 18:52:17 +0100
committerMichael Albinus2010-12-27 18:52:17 +0100
commit4c145d5d06aff906d311f95bff3ccc2cb424580a (patch)
tree6d2a83734c21aa8b6024302a3e8aed53b5f40910
parent2f7c71a117244e1967009e8a4a0c82cd7388b470 (diff)
downloademacs-4c145d5d06aff906d311f95bff3ccc2cb424580a.tar.gz
emacs-4c145d5d06aff906d311f95bff3ccc2cb424580a.zip
* net/secrets.el (secrets-delete-alias): New defun.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/secrets.el14
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d49053085c1..d4023ba55cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12010-12-27 Michael Albinus <michael.albinus@gmx.de> 12010-12-27 Michael Albinus <michael.albinus@gmx.de>
2 2
3 * net/secrets.el (secrets-delete-alias): New defun.
4
52010-12-27 Michael Albinus <michael.albinus@gmx.de>
6
3 * net/tramp.el (tramp-default-user-alist): Do not add "ssh" based 7 * net/tramp.el (tramp-default-user-alist): Do not add "ssh" based
4 methods, otherwise ~/.ssh/config would be ignored. 8 methods, otherwise ~/.ssh/config would be ignored.
5 9
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 4487407971f..33376418025 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -448,10 +448,9 @@ If there is no such COLLECTION, return nil."
448 ;; Check the collections. 448 ;; Check the collections.
449 (catch 'collection-found 449 (catch 'collection-found
450 (dolist (collection-path (secrets-get-collections) nil) 450 (dolist (collection-path (secrets-get-collections) nil)
451 (when 451 (when (string-equal
452 (string-equal 452 collection
453 collection 453 (secrets-get-collection-property collection-path "Label"))
454 (secrets-get-collection-property collection-path "Label"))
455 (throw 'collection-found collection-path)))))) 454 (throw 'collection-found collection-path))))))
456 455
457(defun secrets-create-collection (collection) 456(defun secrets-create-collection (collection)
@@ -490,6 +489,13 @@ For the time being, only the alias \"default\" is supported."
490 secrets-interface-service "SetAlias" 489 secrets-interface-service "SetAlias"
491 alias :object-path collection-path)))) 490 alias :object-path collection-path))))
492 491
492(defun secrets-delete-alias (alias)
493 "Delete ALIAS, referencing to a collection."
494 (dbus-call-method
495 :session secrets-service secrets-path
496 secrets-interface-service "SetAlias"
497 alias :object-path secrets-empty-path))
498
493(defun secrets-unlock-collection (collection) 499(defun secrets-unlock-collection (collection)
494 "Unlock collection labelled COLLECTION. 500 "Unlock collection labelled COLLECTION.
495If successful, return the object path of the collection." 501If successful, return the object path of the collection."