webapp: Fix UI for removing XMPP connection.

3 files changed, 13 insertions, 1 deletions

diff --git a/Creds.hs b/Creds.hs
index 0586f2070..7273ed966 100644
--- a/Creds.hs
+++ b/Creds.hs
@@ -14,6 +14,7 @@ module Creds (
 	getEnvCredPair,
 	writeCacheCreds,
 	readCacheCreds,
+	removeCreds,
 ) where
 
 import Common.Annex
@@ -138,3 +139,9 @@ decodeCredPair :: Creds -> Maybe CredPair
 decodeCredPair creds = case lines creds of
 	l:p:[] -> Just (l, p)
 	_ -> Nothing
+
+removeCreds :: FilePath -> Annex ()
+removeCreds file = do
+	d <- fromRepo gitAnnexCredsDir
+	let f = d </> file
+	liftIO $ nukeFile f
diff --git a/debian/changelog b/debian/changelog
index cefdca193..52f20250f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium
   * webapp: Start even if the current directory is listed in
     ~/.config/git-annex/autostart but no longer has a git repository in it.
   * findref: New command, like find but shows files in a specified git ref.
+  * webapp: Fix UI for removing XMPP connection.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Apr 2014 21:33:35 -0400
 
diff --git a/doc/todo/allow_removing_jabber_configuration.mdwn b/doc/todo/allow_removing_jabber_configuration.mdwn
index 4b9120cfd..62370258d 100644
--- a/doc/todo/allow_removing_jabber_configuration.mdwn
+++ b/doc/todo/allow_removing_jabber_configuration.mdwn
@@ -1 +1,5 @@
-right now it is unclear through the webapp how to unconfigure a jabber account, which is especially critical considering the password needs to be stored in the clear (where?). -- [[anarcat]]
+right now it is unclear through the webapp how to unconfigure a jabber
+account, which is especially critical considering the password needs to be
+stored in the clear (where?). -- [[anarcat]]
+
+> [[fixed|done]] --[[Joey]]