--- a/mcabber/src/settings.c Sun Dec 09 19:26:37 2007 +0100
+++ b/mcabber/src/settings.c Mon Dec 10 21:45:24 2007 +0100
@@ -388,10 +388,14 @@
// default_muc_nickname()
// Return the user's default nickname
// The caller should free the string after use
-char *default_muc_nickname(void)
+char *default_muc_nickname(const char *roomid)
{
char *nick;
+ nick = (char*)jb_get_bookmark_nick(roomid);
+ if (nick)
+ return g_strdup(nick);
+
// We try the "nickname" option, then the username part of the jid.
nick = (char*)settings_opt_get("nickname");
if (nick)