comparison libpurple/protocols/jabber/chat.c @ 27590:a08e84032814

merge of '2348ff22f0ff3453774b8b25b36238465580c609' and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Jul 2009 05:43:38 +0000
parents e90fa379fcec
children fdf1f64de3a0
comparison
equal deleted inserted replaced
27104:048bcf41deef 27590:a08e84032814
233 purple_notify_error(gc, _("Invalid Room Name"), _("Invalid Room Name"), 233 purple_notify_error(gc, _("Invalid Room Name"), _("Invalid Room Name"),
234 buf); 234 buf);
235 purple_serv_got_join_chat_failed(gc, data); 235 purple_serv_got_join_chat_failed(gc, data);
236 g_free(buf); 236 g_free(buf);
237 return; 237 return;
238 } else if(!jabber_nameprep_validate(server)) { 238 } else if(!jabber_domain_validate(server)) {
239 char *buf = g_strdup_printf(_("%s is not a valid server name"), server); 239 char *buf = g_strdup_printf(_("%s is not a valid server name"), server);
240 purple_notify_error(gc, _("Invalid Server Name"), 240 purple_notify_error(gc, _("Invalid Server Name"),
241 _("Invalid Server Name"), buf); 241 _("Invalid Server Name"), buf);
242 purple_serv_got_join_chat_failed(gc, data); 242 purple_serv_got_join_chat_failed(gc, data);
243 g_free(buf); 243 g_free(buf);