pidgin/pidgin

Move minidialog stuff from utils to its source file

2021-07-22, Elliott Sales de Andrade
d92defc9ba95
Move minidialog stuff from utils to its source file

* Remove minidialog list from utils.
It's supposed to be used to delete them when the connection is dropped, but this list is never added to. And the dialogs are automatically closed when the account disconnects in some other way that I could not find.
Consequently, drop the unused `gc` from `pidgin_make_mini_dialog*`.
* Replace `PidginUtilMiniDialogCallback` by `PidginMiniDialogCallback`.
It is just a wrapper around the latter, with different argument order.
* Move minidialog wrappers from utils to `minidialog.c`. And fix naming/arguments to match the existing functions.

Testing Done:
Compiled, connected an account that had buddy requests, but didn't act on them.

Reviewed at https://reviews.imfreedom.org/r/788/
/*
*
* purple
*
* Purple is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
* source distribution.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "purple-gio.h"
#include "debug.h"
#include "internal.h"
#include "proxy.h"
typedef struct {
GIOStream *stream;
GInputStream *input;
GOutputStream *output;
} GracefulCloseData;
static gboolean
graceful_close_cb(gpointer user_data)
{
GracefulCloseData *data = user_data;
GError *error = NULL;
if (g_input_stream_has_pending(data->input) ||
g_output_stream_has_pending(data->output)) {
/* Has pending operations. Not ready to close yet.
* Try again later.
*/
return G_SOURCE_CONTINUE;
}
/* Finally can gracefully close */
/* Close input stream, from wrapper or GIOStream */
if (!g_input_stream_close(data->input, NULL, &error)) {
if (error->code != G_IO_ERROR_CANCELLED) {
purple_debug_warning("gio", "Error closing input stream: %s",
error->message);
}
g_clear_error(&error);
}
g_clear_object(&data->input);
/* Close output stream, from wrapper or GIOStream */
if (!g_output_stream_close(data->output, NULL, &error)) {
if (error->code != G_IO_ERROR_CANCELLED) {
purple_debug_warning("gio", "Error closing output stream: %s",
error->message);
}
g_clear_error(&error);
}
g_clear_object(&data->output);
/* Close io stream */
if (!g_io_stream_close(data->stream, NULL, &error)) {
if (error->code != G_IO_ERROR_CANCELLED) {
purple_debug_warning("gio", "Error closing stream: %s",
error->message);
}
g_clear_error(&error);
}
g_clear_object(&data->stream);
/* Clean up */
g_free(data);
return G_SOURCE_REMOVE;
}
void
purple_gio_graceful_close(GIOStream *stream,
GInputStream *input, GOutputStream *output)
{
GracefulCloseData *data;
g_return_if_fail(G_IS_IO_STREAM(stream));
g_return_if_fail(input == NULL || G_IS_INPUT_STREAM(input));
g_return_if_fail(output == NULL || G_IS_OUTPUT_STREAM(output));
data = g_new(GracefulCloseData, 1);
data->stream = g_object_ref(stream);
if (input == NULL)
input = g_io_stream_get_input_stream(stream);
data->input = g_object_ref(input);
if (output == NULL)
output = g_io_stream_get_output_stream(stream);
data->output = g_object_ref(output);
/* Try gracefully closing the stream synchronously */
if (graceful_close_cb(data) == G_SOURCE_CONTINUE) {
/* Has pending operations. Do so asynchronously */
g_idle_add(graceful_close_cb, data);
}
}
GSocketClient *
purple_gio_socket_client_new(PurpleAccount *account, GError **error)
{
GProxyResolver *resolver;
GSocketClient *client;
resolver = purple_proxy_get_proxy_resolver(account, error);
if (resolver == NULL) {
return NULL;
}
client = g_socket_client_new();
g_socket_client_set_proxy_resolver(client, resolver);
g_object_unref(resolver);
return client;
}
guint16
purple_socket_listener_add_any_inet_port(GSocketListener *listener,
GObject *source_object, GError **error)
{
GError *internal_error = NULL;
guint16 port, start, end;
if (!purple_prefs_get_bool("/purple/network/ports_range_use")) {
return g_socket_listener_add_any_inet_port(listener, source_object,
error);
}
start = purple_prefs_get_int("/purple/network/ports_range_start");
end = purple_prefs_get_int("/purple/network/ports_range_end");
for (port = start; port <= end; port++) {
if (g_socket_listener_add_inet_port(listener, port, source_object,
&internal_error)) {
return port;
} else if (port != end) {
g_error_free(internal_error);
}
}
g_propagate_error(error, internal_error);
return 0;
}