[telepathy-gabble/master] Add tie-break and unsupported-info Jingle errors

[Will Thompson]

---
 src/error.c |   20 ++++++++++++++++++++
 src/error.h |    2 ++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/error.c b/src/error.c
index 5c2322e..0d44ad7 100644
--- a/src/error.c
+++ b/src/error.c
@@ -272,6 +272,26 @@ static const XmppErrorSpec xmpp_errors[NUM_XMPP_ERRORS] =
     },
 
     {
+      "tie-break",
+      "The request is rejected because it was sent while the initiator was "
+      "awaiting a reply on a similar request.",
+      "cancel",
+      XMPP_ERROR_CONFLICT,
+      NS_JINGLE_ERRORS,
+      { 0, },
+    },
+
+    {
+      "unsupported-info",
+      "The recipient does not support the informational payload of a "
+      "session-info action.",
+      "cancel",
+      XMPP_ERROR_FEATURE_NOT_IMPLEMENTED,
+      NS_JINGLE_ERRORS,
+      { 0, },
+    },
+
+    {
       "no-valid-streams",
       "None of the available streams are acceptable.",
       "cancel",
diff --git a/src/error.h b/src/error.h
index 95770f1..989311c 100644
--- a/src/error.h
+++ b/src/error.h
@@ -72,6 +72,8 @@ typedef enum {
 
     XMPP_ERROR_JINGLE_OUT_OF_ORDER,
     XMPP_ERROR_JINGLE_UNKNOWN_SESSION,
+    XMPP_ERROR_JINGLE_TIE_BREAK,
+    XMPP_ERROR_JINGLE_UNSUPPORTED_INFO,
 
     XMPP_ERROR_SI_NO_VALID_STREAMS,
     XMPP_ERROR_SI_BAD_PROFILE,
-- 
1.5.6.5