[telepathy-glib/master] Add and document new errors

[Simon McVittie]

---
 docs/reference/telepathy-glib-sections.txt |    5 ++++
 telepathy-glib/errors.c                    |   30 ++++++++++++++++++++++++++++
 telepathy-glib/errors.h                    |    5 ++++
 3 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index e8b5db4..c303302 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -1702,6 +1702,11 @@ TP_ERROR_STR_TERMINATED
 TP_ERROR_STR_CONNECTION_REFUSED
 TP_ERROR_STR_CONNECTION_FAILED
 TP_ERROR_STR_CONNECTION_LOST
+TP_ERROR_STR_ALREADY_CONNECTED
+TP_ERROR_STR_CONNECTION_REPLACED
+TP_ERROR_STR_REGISTRATION_EXISTS
+TP_ERROR_STR_SERVICE_BUSY
+TP_ERROR_STR_RESOURCE_UNAVAILABLE
 <SUBSECTION Standard>
 tp_error_get_type
 tp_errors_quark
diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c
index edc592d..f87b5a9 100644
--- a/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
@@ -146,6 +146,26 @@
  *     Raised when a connection can't be established.
  * @TP_ERROR_CONNECTION_LOST: org.freedesktop.Telepathy.Error.ConnectionLost:
  *     Raised when a connection is broken.
+ * @TP_ERROR_ALREADY_CONNECTED: org.freedesktop.Telepathy.Error.AlreadyConnected:
+ *     Raised on attempts to connect again to an account that is already
+ *     connected, if the protocol or server does not allow this.
+ *     Since 0.7.UNRELEASED
+ * @TP_ERROR_CONNECTION_REPLACED: org.freedesktop.Telepathy.Error.ConnectionReplaced:
+ *     Used as disconnection reason for an existing connection if it is
+ *     disconnected because a second connection to the same account is made.
+ *     Since 0.7.UNRELEASED
+ * @TP_ERROR_REGISTRATION_EXISTS: org.freedesktop.Telepathy.Error.RegistrationExists:
+ *     Raised on attempts to register an account on a server when the account
+ *     already exists.
+ *     Since 0.7.UNRELEASED
+ * @TP_ERROR_SERVICE_BUSY: org.freedesktop.Telepathy.Error.ServiceBusy:
+ *     Raised when a server or other infrastructure rejects a request because
+ *     it is too busy.
+ *     Since 0.7.UNRELEASED
+ * @TP_ERROR_RESOURCE_UNAVAILABLE: org.freedesktop.Telepathy.Error.ResourceUnavailable:
+ *     Raised when a local process rejects a request because it does not have
+ *     enough of a resource, such as memory.
+ *     Since 0.7.UNRELEASED
  *
  * Enumerated type representing the Telepathy D-Bus errors.
  */
@@ -260,6 +280,16 @@ tp_error_get_type (void)
         { TP_ERROR_CONNECTION_REFUSED, "TP_ERROR_CONNECTION_REFUSED", "ConnectionRefused" },
         { TP_ERROR_CONNECTION_FAILED, "TP_ERROR_CONNECTION_FAILED", "ConnectionFailed" },
         { TP_ERROR_CONNECTION_LOST, "TP_ERROR_CONNECTION_LOST", "ConnectionLost" },
+        /* new in telepathy-spec 0.17.27 / telepathy-glib 0.7.UNRELEASED */
+        { TP_ERROR_ALREADY_CONNECTED, "TP_ERROR_ALREADY_CONNECTED",
+          "AlreadyConnected" },
+        { TP_ERROR_CONNECTION_REPLACED, "TP_ERROR_CONNECTION_REPLACED",
+          "ConnectionReplaced" },
+        { TP_ERROR_REGISTRATION_EXISTS, "TP_ERROR_REGISTRATION_EXISTS",
+          "RegistrationExists" },
+        { TP_ERROR_SERVICE_BUSY, "TP_ERROR_SERVICE_BUSY", "ServiceBusy" },
+        { TP_ERROR_RESOURCE_UNAVAILABLE, "TP_ERROR_RESOURCE_UNAVAILABLE",
+          "ResourceUnavailable" },
         { 0 }
       };
 
diff --git a/telepathy-glib/errors.h b/telepathy-glib/errors.h
index fc5bc1d..0d0d1eb 100644
--- a/telepathy-glib/errors.h
+++ b/telepathy-glib/errors.h
@@ -74,6 +74,11 @@ typedef enum {
     TP_ERROR_CONNECTION_REFUSED,
     TP_ERROR_CONNECTION_FAILED,
     TP_ERROR_CONNECTION_LOST,
+    TP_ERROR_ALREADY_CONNECTED,
+    TP_ERROR_CONNECTION_REPLACED,
+    TP_ERROR_REGISTRATION_EXISTS,
+    TP_ERROR_SERVICE_BUSY,
+    TP_ERROR_RESOURCE_UNAVAILABLE,
 } TpError;
 
 const gchar *tp_error_get_dbus_name (TpError error);
-- 
1.5.6.5