comparison libpurple/protocols/bonjour/jabber.c @ 17556:612dc5149964

Close conversation connections when logging out of the Bonjour account. This also fixes leakage.

17555:b13850d13391

	return "12";
}
#endif

static BonjourJabberConversation *
bonjour_jabber_conv_new(const char *name) {

	BonjourJabberConversation *bconv = g_new0(BonjourJabberConversation, 1);
	bconv->socket = -1;
	bconv->buddy_name = g_strdup(name);
	bconv->watcher_id = -1;

	return bconv;
}

	 */
	if (closed_conversation || purple_str_has_prefix(message, STREAM_END)) {
		char *closed_conv_message;

		/* Close the socket, clear the watcher and free memory */
		if (bb->conversation != NULL)
			bonjour_jabber_close_conversation(pb);

		/* Inform the user that the conversation has been closed */
		conversation = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, account);
		closed_conv_message = g_strdup_printf(_("%s has closed the conversation."), pb->name);
		purple_conversation_write(conversation, NULL, closed_conv_message, PURPLE_MESSAGE_SYSTEM, time(NULL));

	bb = pb->proto_data;

	/* Check if the conversation has been previously started */
	if (bb->conversation == NULL)
	{
		bb->conversation = bonjour_jabber_conv_new(pb->name);
		bb->conversation->socket = client_socket;

		if (bb->conversation->stream_started == FALSE) {
			char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
							     purple_buddy_get_name(pb));

	{
		int socket = _connect_to_buddy(pb);
		if (socket < 0)
			return -10001;

		bb->conversation = bonjour_jabber_conv_new(pb->name);
		bb->conversation->socket = socket;
		bb->conversation->watcher_id = purple_input_add(bb->conversation->socket,
				PURPLE_INPUT_READ, _client_socket_handler, pb);
	}

			conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, data->account);
			purple_conversation_write(conv, NULL,
						  _("Unable to send the message, the conversation couldn't be started."),
						  PURPLE_MESSAGE_SYSTEM, time(NULL));

			bonjour_jabber_close_conversation(pb);

			g_free(message);
			g_free(stream_start);
			return 0;
		}

	return 1;
}

void
bonjour_jabber_close_conversation(PurpleBuddy *pb)
{
	BonjourBuddy *bb = pb->proto_data;
	BonjourJabberConversation *bconv = bb->conversation;

	if (bconv != NULL)
	{
		/* Close the socket and remove the watcher */
		if (bconv->socket >= 0) {
			/* Send the end of the stream to the other end of the conversation */

			close(bconv->socket);
		}
		purple_input_remove(bconv->watcher_id);

		/* Free all the data related to the conversation */
		g_free(bconv->buddy_name);
		g_free(bconv);
		bb->conversation = NULL;
	}
}

void
bonjour_jabber_stop(BonjourJabber *data)

	if (data->account->gc != NULL)
	{
		GSList *buddies, *l;

		buddies = purple_find_buddies(data->account, purple_account_get_username(data->account));
		for (l = buddies; l; l = l->next)
			bonjour_jabber_close_conversation(l->data);
		g_slist_free(buddies);
	}
}

17556:612dc5149964

	return "12";
}
#endif

static BonjourJabberConversation *
bonjour_jabber_conv_new() {

	BonjourJabberConversation *bconv = g_new0(BonjourJabberConversation, 1);
	bconv->socket = -1;
	bconv->watcher_id = -1;

	return bconv;
}

	 */
	if (closed_conversation || purple_str_has_prefix(message, STREAM_END)) {
		char *closed_conv_message;

		/* Close the socket, clear the watcher and free memory */
		bonjour_jabber_close_conversation(bb->conversation);
		bb->conversation = NULL;

		/* Inform the user that the conversation has been closed */
		conversation = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, account);
		closed_conv_message = g_strdup_printf(_("%s has closed the conversation."), pb->name);
		purple_conversation_write(conversation, NULL, closed_conv_message, PURPLE_MESSAGE_SYSTEM, time(NULL));

	bb = pb->proto_data;

	/* Check if the conversation has been previously started */
	if (bb->conversation == NULL)
	{
		bb->conversation = bonjour_jabber_conv_new();
		bb->conversation->socket = client_socket;

		if (bb->conversation->stream_started == FALSE) {
			char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
							     purple_buddy_get_name(pb));

	{
		int socket = _connect_to_buddy(pb);
		if (socket < 0)
			return -10001;

		bb->conversation = bonjour_jabber_conv_new();
		bb->conversation->socket = socket;
		bb->conversation->watcher_id = purple_input_add(bb->conversation->socket,
				PURPLE_INPUT_READ, _client_socket_handler, pb);
	}

			conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, bb->name, data->account);
			purple_conversation_write(conv, NULL,
						  _("Unable to send the message, the conversation couldn't be started."),
						  PURPLE_MESSAGE_SYSTEM, time(NULL));

			bonjour_jabber_close_conversation(bb->conversation);
			bb->conversation = NULL;

			g_free(message);
			g_free(stream_start);
			return 0;
		}

	return 1;
}

void
bonjour_jabber_close_conversation(BonjourJabberConversation *bconv)
{
	if (bconv != NULL)
	{
		/* Close the socket and remove the watcher */
		if (bconv->socket >= 0) {
			/* Send the end of the stream to the other end of the conversation */

			close(bconv->socket);
		}
		purple_input_remove(bconv->watcher_id);

		/* Free all the data related to the conversation */
		g_free(bconv);
	}
}

void
bonjour_jabber_stop(BonjourJabber *data)

	if (data->account->gc != NULL)
	{
		GSList *buddies, *l;

		buddies = purple_find_buddies(data->account, purple_account_get_username(data->account));
		for (l = buddies; l; l = l->next) {
			BonjourBuddy *bb = ((PurpleBuddy*) l->data)->proto_data;
			bonjour_jabber_close_conversation(bb->conversation);
			bb->conversation = NULL;
		}
		g_slist_free(buddies);
	}
}