applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

printers: Use consistent GTask return pattern

Browse source
This commit is contained in:
Robert Ancell 2018-11-23 11:04:11 +13:00 • committed by Marek Kašík
parent e436cf1f60
commit bf463f2662
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
panels/printers/pp-host.c
View file

@ -432,7 +432,6 @@ pp_host_get_remote_cups_devices_finish (PpHost *host,
typedef struct typedef struct
{ {
PpDevicesList *devices;
PpHost *host; PpHost *host;
gint port; gint port;
} JetDirectData; } JetDirectData;
@ -442,7 +441,6 @@ jetdirect_data_free (JetDirectData *data)
{ {
if (data != NULL) if (data != NULL)
{ {
pp_devices_list_free (data->devices);
g_clear_object (&data->host); g_clear_object (&data->host);
g_free (data); g_free (data);
} }
@ -457,12 +455,14 @@ jetdirect_connection_test_cb (GObject *source_object,
PpHostPrivate *priv; PpHostPrivate *priv;
PpPrintDevice *device; PpPrintDevice *device;
JetDirectData *data; JetDirectData *data;
gpointer result; PpDevicesList *devices;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
GTask *task = G_TASK (user_data); GTask *task = G_TASK (user_data);
data = g_task_get_task_data (task); data = g_task_get_task_data (task);
devices = g_new0 (PpDevicesList, 1);
connection = g_socket_client_connect_to_host_finish (G_SOCKET_CLIENT (source_object), connection = g_socket_client_connect_to_host_finish (G_SOCKET_CLIENT (source_object),
res, res,
&error); &error);
@ -492,12 +492,10 @@ jetdirect_connection_test_cb (GObject *source_object,
g_free (device_uri); g_free (device_uri);
data->devices->devices = g_list_append (data->devices->devices, device); devices->devices = g_list_append (devices->devices, device);
} }
result = data->devices; g_task_return_pointer (task, devices, (GDestroyNotify) pp_devices_list_free);
data->devices = NULL;
g_task_return_pointer (task, result, (GDestroyNotify) pp_devices_list_free);
g_object_unref (task); g_object_unref (task);
} }
@ -515,11 +513,9 @@ pp_host_get_jetdirect_devices_async (PpHost *host,
JetDirectData *data; JetDirectData *data;
GTask *task; GTask *task;
gchar *address; gchar *address;
gpointer result;
data = g_new0 (JetDirectData, 1); data = g_new0 (JetDirectData, 1);
data->host = g_object_ref (host); data->host = g_object_ref (host);
data->devices = g_new0 (PpDevicesList, 1);
if (priv->port == PP_HOST_UNSET_PORT) if (priv->port == PP_HOST_UNSET_PORT)
data->port = PP_HOST_DEFAULT_JETDIRECT_PORT; data->port = PP_HOST_DEFAULT_JETDIRECT_PORT;
@ -545,9 +541,7 @@ pp_host_get_jetdirect_devices_async (PpHost *host,
} }
else else
{ {
result = data->devices; g_task_return_pointer (task, g_new0 (PpDevicesList, 1), (GDestroyNotify) pp_devices_list_free);
data->devices = NULL;
g_task_return_pointer (task, result, (GDestroyNotify) pp_devices_list_free);
g_object_unref (task); g_object_unref (task);
} }