comparison libpurple/protocols/jabber/jingle/session.c @ 29327:c4f836780e1c

propagate from branch 'im.pidgin.pidgin' (head 5e3164a6a1df028fc66f7e072be0d78d9d995389) to branch 'im.pidgin.pidgin.next.minor' (head 6ee3a8d962ff2bb002967cc29bd5aa0b45bc2028)

28661:588a7aef5f7c

	purple_debug_info("jingle", "lookup: %p\n", session);

	return session;
}

#if GLIB_CHECK_VERSION(2,4,0)
static gboolean find_by_jid_ghr(gpointer key,
		gpointer value, gpointer user_data)
{
	JingleSession *session = (JingleSession *)value;
	const gchar *jid = user_data;

	g_free(cmp_jid);

	return FALSE;
}

#else /* GLIB_CHECK_VERSION 2.4.0 */

/* Ugly code; g_hash_table_find version above is much nicer */
struct session_find_jid
{
	const gchar *jid;
	JingleSession *ret;
	gboolean use_bare;
};

static void find_by_jid_ghr(gpointer key, gpointer value, gpointer user_data)
{
	JingleSession *session = (JingleSession *)value;
	struct session_find_jid *data = user_data;
	gchar *remote_jid;
	gchar *cmp_jid;

	if (data->ret != NULL)
		return;

	remote_jid = jingle_session_get_remote_jid(session);
	cmp_jid = data->use_bare ? jabber_get_bare_jid(remote_jid)
				: g_strdup(remote_jid);
	g_free(remote_jid);

	if (g_str_equal(data->jid, cmp_jid))
		data->ret = session;

	g_free(cmp_jid);
}
#endif /* GLIB_CHECK_VERSION 2.4.0 */

JingleSession *
jingle_session_find_by_jid(JabberStream *js, const gchar *jid)
{
#if GLIB_CHECK_VERSION(2,4,0)
	return js->sessions != NULL ?
			g_hash_table_find(js->sessions,
			find_by_jid_ghr, (gpointer)jid) : NULL; 
#else
	struct session_find_jid data;

	if (js->sessions == NULL)
		return NULL;

	data.jid = jid;
	data.ret = NULL;
	data.use_bare = g_utf8_strchr(jid, -1, '/') == NULL;

	g_hash_table_foreach(js->sessions, find_by_jid_ghr, &data);
	return data.ret;
#endif
}

static xmlnode *
jingle_add_jingle_packet(JingleSession *session,
			 JabberIq *iq, JingleActionType action)

29327:c4f836780e1c

	purple_debug_info("jingle", "lookup: %p\n", session);

	return session;
}

static gboolean find_by_jid_ghr(gpointer key,
		gpointer value, gpointer user_data)
{
	JingleSession *session = (JingleSession *)value;
	const gchar *jid = user_data;

	g_free(cmp_jid);

	return FALSE;
}

JingleSession *
jingle_session_find_by_jid(JabberStream *js, const gchar *jid)
{
	return js->sessions != NULL ?
			g_hash_table_find(js->sessions,
			find_by_jid_ghr, (gpointer)jid) : NULL; 
}

static xmlnode *
jingle_add_jingle_packet(JingleSession *session,
			 JabberIq *iq, JingleActionType action)