[telepathy-gabble/master] Conflict maps to NotYours during registration

[Will Thompson]

---
 src/connection.c |    2 +-
 src/register.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 1ca72f9..7993811 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1832,7 +1832,7 @@ registration_finished_cb (GabbleRegister *reg,
 
       tp_base_connection_change_status ((TpBaseConnection *) conn,
           TP_CONNECTION_STATUS_DISCONNECTED,
-          (err_code == TP_ERROR_INVALID_ARGUMENT) ?
+          (err_code == TP_ERROR_NOT_YOURS) ?
             TP_CONNECTION_STATUS_REASON_NAME_IN_USE :
             TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED);
     }
diff --git a/src/register.c b/src/register.c
index 0a76e61..54eb790 100644
--- a/src/register.c
+++ b/src/register.c
@@ -217,7 +217,7 @@ set_reply_cb (GabbleConnection *conn,
           error = gabble_xmpp_error_from_node (node, NULL);
           if (error == XMPP_ERROR_CONFLICT)
             {
-              code = TP_ERROR_INVALID_ARGUMENT;
+              code = TP_ERROR_NOT_YOURS;
             }
 
           g_string_append_printf (msg, ": %s",
-- 
1.5.6.5