comparison libpurple/protocols/jabber/jabber.c @ 23817:41d6d4217d21

Further decoupled Jingle code from jabber.c: * Removed unnecessary Jingle functions from the header * Moved JingleSession structure to jingle.c * Created functions to remove jabber.c's dependence on JingleSession: - jabber_jingle_session_terminate_session_media - jabber_jingle_session_terminate_sessions

23816:e73b03097664

void jabber_close(PurpleConnection *gc)
{
	JabberStream *js = gc->proto_data;

#ifdef USE_VV
	/* Close all of the open media sessions on this stream */
	GList *values = g_hash_table_get_values(js->sessions);
	GList *iter = values;

	for (; iter; iter = iter->next) {
		JingleSession *session = (JingleSession *)iter->data;
		purple_media_hangup(session->media);
	}

	g_list_free(values);
#endif

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.

{
	JabberStream *js = gc->proto_data;
	JabberID *jid;
	JabberBuddy *jb;
	JabberBuddyResource *jbr;
#ifdef USE_VV
	JingleSession *session;
#endif
	if(!(jid = jabber_id_new(who)))
		return;

#ifdef USE_VV
	session = jabber_jingle_session_find_by_jid(js, who);

	if (session) {
		purple_media_hangup(session->media);
	}

#endif
	if((jb = jabber_buddy_find(js, who, TRUE)) &&
			(jbr = jabber_buddy_find_resource(jb, jid->resource))) {
		if(jbr->thread_id) {
			g_free(jbr->thread_id);

23817:41d6d4217d21

void jabber_close(PurpleConnection *gc)
{
	JabberStream *js = gc->proto_data;

#ifdef USE_VV
	/* Close all of the open Jingle sessions on this stream */
	jabber_jingle_session_terminate_sessions(js);
#endif

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.

{
	JabberStream *js = gc->proto_data;
	JabberID *jid;
	JabberBuddy *jb;
	JabberBuddyResource *jbr;

	if(!(jid = jabber_id_new(who)))
		return;

#ifdef USE_VV
	jabber_jingle_session_terminate_session_media(js, who);
#endif
	if((jb = jabber_buddy_find(js, who, TRUE)) &&
			(jbr = jabber_buddy_find_resource(jb, jid->resource))) {
		if(jbr->thread_id) {
			g_free(jbr->thread_id);