From 5d48386ade9eb7b95ed7e87c1a0ef5cb8d49b46c Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 12 Jan 2021 19:35:14 +0100
Subject: [PATCH] xmpp-parsers/bookmarks2: Bump XEP-0402 version in DOAP and
 ChangeLog.

---
 xmpp-parsers/ChangeLog         | 2 ++
 xmpp-parsers/doap.xml          | 2 +-
 xmpp-parsers/src/bookmarks2.rs | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/xmpp-parsers/ChangeLog b/xmpp-parsers/ChangeLog
index 75f704e..1a8bb49 100644
--- a/xmpp-parsers/ChangeLog
+++ b/xmpp-parsers/ChangeLog
@@ -12,6 +12,8 @@ UNRELEASED  Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
         - Bump XEP-0167 to version 1.2.0, adding rtcp-mux.
         - Bump XEP-0176 to version 1.1, fixing interoperability with other
           clients.
+        - Bump XEP-0402 to version 1.1.1, bumping its namespace and adding
+          support for extension data.
         - Bump all dependencies to their latest version.
         - Some more helper constructors.
         - Make public some stuff that should have been public from the very
diff --git a/xmpp-parsers/doap.xml b/xmpp-parsers/doap.xml
index ac38265..bb6352f 100644
--- a/xmpp-parsers/doap.xml
+++ b/xmpp-parsers/doap.xml
@@ -519,7 +519,7 @@
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0402.html"/>
             <xmpp:status>complete</xmpp:status>
-            <xmpp:version>0.3.0</xmpp:version>
+            <xmpp:version>1.1.1</xmpp:version>
             <xmpp:since>0.16.0</xmpp:since>
         </xmpp:SupportedXep>
     </implements>
diff --git a/xmpp-parsers/src/bookmarks2.rs b/xmpp-parsers/src/bookmarks2.rs
index 0a3ebda..bbccd40 100644
--- a/xmpp-parsers/src/bookmarks2.rs
+++ b/xmpp-parsers/src/bookmarks2.rs
@@ -77,6 +77,7 @@ impl TryFrom<Element> for Conference {
                     ));
                 }
                 check_no_children!(child, "nick");
+                check_no_attributes!(child, "nick");
                 conference.nick = Some(child.text());
             } else if child.is("password", ns::BOOKMARKS2) {
                 if conference.password.is_some() {
@@ -85,6 +86,7 @@ impl TryFrom<Element> for Conference {
                     ));
                 }
                 check_no_children!(child, "password");
+                check_no_attributes!(child, "password");
                 conference.password = Some(child.text());
             }
         }