aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2012-02-23 12:51:12 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2012-02-23 12:51:12 +0000
commit441a67e2d5032f1f2f9babd027c5fc6bb5676952 (patch)
tree50878f4a6c017f82577ca87e74b0015d57638c6b /protocols
parentd3dd4d591b7731f8351110c83a97f36b184e6dc6 (diff)
Make the error message on invalid Jabber room names (this is a FAQ by now)
a little more helpful.
Diffstat (limited to 'protocols')
-rw-r--r--protocols/jabber/jabber.c5
1 files changed, 4 insertions, 1 deletions
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