From 441a67e2d5032f1f2f9babd027c5fc6bb5676952 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 23 Feb 2012 12:51:12 +0000 Subject: Make the error message on invalid Jabber room names (this is a FAQ by now) a little more helpful. --- protocols/jabber/jabber.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'protocols/jabber/jabber.c') diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index 1169963f..723894fe 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -472,8 +472,11 @@ static void jabber_remove_buddy( struct im_connection *ic, char *who, char *grou static struct groupchat *jabber_chat_join_( struct im_connection *ic, const char *room, const char *nick, const char *password, set_t **sets ) { + struct jabber_data *jd = ic->proto_data; + if( strchr( room, '@' ) == NULL ) - imcb_error( ic, "Invalid room name: %s", room ); + imcb_error( ic, "%s is not a valid Jabber room name. Maybe you mean %s@conference.%s?", + room, room, jd->server ); else if( jabber_chat_by_jid( ic, room ) ) imcb_error( ic, "Already present in chat `%s'", room ); else -- cgit v1.2.3