From b85fd5e78ceacc93241ae71096ba8ffb72937852 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Fri, 23 May 2014 00:55:30 +0100
Subject: [PATCH] Use account muc_nick when no nick for bookmark

---
 src/xmpp/bookmark.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c
index a252841d..01e86451 100644
--- a/src/xmpp/bookmark.c
+++ b/src/xmpp/bookmark.c
@@ -326,8 +326,10 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
 
                 ++autojoin_count;
 
+                char *account_name = jabber_get_account_name();
+                ProfAccount *account = accounts_get_account(account_name);
                 if (name == NULL) {
-                    name = my_jid->localpart;
+                    name = account->muc_nick;
                 }
 
                 log_debug("Autojoin %s with nick=%s", jid, name);
@@ -337,6 +339,7 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
                     muc_join_room(jid, name, password, TRUE);
                 }
                 jid_destroy(room_jid);
+                account_free(account);
             } else {
                 log_debug("Rejected autojoin %s (maximum has been reached)", jid);
             }