Mercurial > ~mikael > mcabber > hg

diff mcabber/src/settings.c @ 1395:d431cd75eb53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use bookmarked nickname when manually joining a room
author Mikael Berthe <mikael@lilotux.net>
date Mon, 10 Dec 2007 21:45:24 +0100
parents d9606bd03144
children 366ef500c522
line wrap: on
line diff
--- 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)