comparison libpurple/protocols/jabber/jutil.c @ 28405:2c85f44113b4

jabber: Strip the '/' off of a JID in jabber_normalize. This is what Pidgin did pre-2.6.0 and breaks the log directories for accounts with no resource. Closes #9959.

28404:15833e4f2e09

{
	PurpleConnection *gc = account ? account->gc : NULL;
	JabberStream *js = gc ? gc->proto_data : NULL;
	static char buf[3072]; /* maximum legal length of a jabber jid */
	JabberID *jid;

	jid = jabber_id_new(in);

	if(!jid)
		return NULL;

	if(js && jid->node && jid->resource &&

28405:2c85f44113b4

{
	PurpleConnection *gc = account ? account->gc : NULL;
	JabberStream *js = gc ? gc->proto_data : NULL;
	static char buf[3072]; /* maximum legal length of a jabber jid */
	JabberID *jid;
	char *tmp;
	size_t len = strlen(in);

	/*
	 * If the JID ends with a '/', jabber_id_new is going to throw it away as
	 * invalid.  However, this is what the UI generates for a JID with no
	 * resource. Deal with that by dropping away the '/'...
	 */
	if (in[len - 1] == '/')
		tmp = g_strndup(in, len - 1);
	else
		tmp = (gchar *)in;

	jid = jabber_id_new(tmp);

	if (tmp != in)
		g_free(tmp);

	if(!jid)
		return NULL;

	if(js && jid->node && jid->resource &&