pidgin: 88a31134: jabber: Fix /join behavior. Closes #142..

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 88a31134afaea05acb0a895396443631d4ffe4a8
Parent:   4a47d72cd1aa75a89a42a0bd8d47964cf2c86ca7
Author:   darkrain42 at pidgin.im
Date:     07/17/11 01:08:07
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/88a31134afaea05acb0a895396443631d4ffe4a8

Changelog: 

jabber: Fix /join behavior.  Closes #14205.

Also marked a string for translation.
"/join foo" fails because 'foo' passes nameprep.

Changes against parent 4a47d72cd1aa75a89a42a0bd8d47964cf2c86ca7

  patched  ChangeLog
  patched  libpurple/protocols/jabber/jabber.c

-------------- next part --------------
============================================================
--- ChangeLog	5c88c92ef46f821cd1c727bdf5bc6d827fa5dae1
+++ ChangeLog	327e60848490ed353203226d028ae90cc2853779
@@ -23,6 +23,8 @@ version 2.10.0 (MM/DD/YYYY):
 	XMPP:
 	* Do not generate malformed XML ("</>") when setting an empty mood.
 	  (#14342)
+	* Fix the /join <room> behavior.  (Broken when adding support for
+	  <room>@<server>)  (#14205)
 
 version 2.9.0 (06/23/2011):
 	Pidgin:
============================================================
--- libpurple/protocols/jabber/jabber.c	2513198aedc5af8cea0e17ad8c30ea9f06614954
+++ libpurple/protocols/jabber/jabber.c	e5ba123a05fe85d36e074a0a7b98443108a5f8a8
@@ -3009,7 +3009,7 @@ static PurpleCmdRet jabber_cmd_chat_join
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 	GHashTable *components;
-	JabberID *jid;
+	JabberID *jid = NULL;
 	const char *room = NULL, *server = NULL, *handle = NULL;
 
 	if (!chat || !args || !args[0])
@@ -3017,7 +3017,8 @@ static PurpleCmdRet jabber_cmd_chat_join
 
 	components = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 
-	jid = jabber_id_new(args[0]);
+	if (strchr(args[0], '@'))
+		jid = jabber_id_new(args[0]);
 	if (jid) {
 		room   = jid->node;
 		server = jid->domain;
@@ -3673,8 +3674,7 @@ static void jabber_register_commands(Pur
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_join,
-	                  _("join: <room> [password]:  Join a chat on this server."),
-	                  /* _("join: <room[@server]> [password]:  Join a chat."), */
+	                  _("join: <room[@server]> [password]:  Join a chat."),
 	                  NULL);
 	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));