Mercurial > pidgin

comparison libpurple/protocols/jabber/chat.c @ 22819:42dfa1139b5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '21d37789f674809d615fc7676a092f1da438b0f5' and 'aafbbc317ab5f69e31e0bb6cabc264bb70745ef2'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 02 May 2008 22:51:14 +0000
parents e1012f92ba3b
children 43233dc1d40b 1003f1736be1
comparison
equal deleted inserted replaced
22767:d5b3afea8764 22819:42dfa1139b5c
220 return; 220 return;
221 221
222 if(!handle) 222 if(!handle)
223 handle = js->user->node; 223 handle = js->user->node;
224 224
225 tmp = g_strdup_printf("%s@%s", room, server);
226 room_jid = g_strdup(jabber_normalize(NULL, tmp));
227 g_free(tmp);
228
229 if(!jabber_nodeprep_validate(room)) { 225 if(!jabber_nodeprep_validate(room)) {
230 char *buf = g_strdup_printf(_("%s is not a valid room name"), room); 226 char *buf = g_strdup_printf(_("%s is not a valid room name"), room);
231 purple_notify_error(gc, _("Invalid Room Name"), _("Invalid Room Name"), 227 purple_notify_error(gc, _("Invalid Room Name"), _("Invalid Room Name"),
232 buf); 228 buf);
233 serv_got_join_chat_failed(gc, room_jid);
234 g_free(room_jid);
235 g_free(buf); 229 g_free(buf);
236 return; 230 return;
237 } else if(!jabber_nameprep_validate(server)) { 231 } else if(!jabber_nameprep_validate(server)) {
238 char *buf = g_strdup_printf(_("%s is not a valid server name"), server); 232 char *buf = g_strdup_printf(_("%s is not a valid server name"), server);
239 purple_notify_error(gc, _("Invalid Server Name"), 233 purple_notify_error(gc, _("Invalid Server Name"),
240 _("Invalid Server Name"), buf); 234 _("Invalid Server Name"), buf);
241 serv_got_join_chat_failed(gc, room_jid);
242 g_free(room_jid);
243 g_free(buf); 235 g_free(buf);
244 return; 236 return;
245 } else if(!jabber_resourceprep_validate(handle)) { 237 } else if(!jabber_resourceprep_validate(handle)) {
246 char *buf = g_strdup_printf(_("%s is not a valid room handle"), handle); 238 char *buf = g_strdup_printf(_("%s is not a valid room handle"), handle);
247 purple_notify_error(gc, _("Invalid Room Handle"), 239 purple_notify_error(gc, _("Invalid Room Handle"),
248 _("Invalid Room Handle"), buf); 240 _("Invalid Room Handle"), buf);
249 serv_got_join_chat_failed(gc, room_jid);
250 g_free(buf); 241 g_free(buf);
251 g_free(room_jid);
252 return; 242 return;
253 } 243 }
254 244
255 if(jabber_chat_find(js, room, server)) 245 if(jabber_chat_find(js, room, server))
256 return; 246 return;
247
248 tmp = g_strdup_printf("%s@%s", room, server);
249 room_jid = g_strdup(jabber_normalize(NULL, tmp));
250 g_free(tmp);
257 251
258 chat = g_new0(JabberChat, 1); 252 chat = g_new0(JabberChat, 1);
259 chat->js = gc->proto_data; 253 chat->js = gc->proto_data;
260 254
261 chat->room = g_strdup(room); 255 chat->room = g_strdup(room);