[telepathy-gabble/master] Reset jid when retrying to join

[Sjoerd Simons]

---
 src/muc-channel.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/muc-channel.c b/src/muc-channel.c
index f339e9a..2abf8cd 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -286,7 +286,7 @@ static void handle_error (GObject *source,
     const gchar *message,
     gpointer data);
 
-static void handle_join (GObject *source,
+static void handle_join (WockyMuc *muc,
     WockyXmppStanza *stanza,
     GHashTable *code,
     gpointer data);
@@ -1476,6 +1476,7 @@ handle_nick_conflict (GabbleMucChannel *chan,
    * and remote pending members appropriately.
    */
   g_string_append_c (priv->self_jid, '_');
+  g_object_set (priv->wmuc, "jid", priv->self_jid->str, NULL);
   self_handle = tp_handle_ensure (contact_repo, priv->self_jid->str,
       GUINT_TO_POINTER (GABBLE_JID_ROOM_MEMBER), NULL);
 
-- 
1.5.6.5