[libshumate] network-tile-source: Minor fixes
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libshumate] network-tile-source: Minor fixes
- Date: Sat, 17 Apr 2021 21:35:02 +0000 (UTC)
commit 5ddb3717e3ed28879dc533f4bacc4acdfcaa4c46
Author: James Westman <james jwestman net>
Date: Thu Apr 8 10:40:39 2021 -0500
network-tile-source: Minor fixes
shumate/shumate-network-tile-source.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/shumate/shumate-network-tile-source.c b/shumate/shumate-network-tile-source.c
index 2b41e12..8c4a4e7 100644
--- a/shumate/shumate-network-tile-source.c
+++ b/shumate/shumate-network-tile-source.c
@@ -763,13 +763,13 @@ on_pixbuf_created_from_cache (GObject *source_object, GAsyncResult *res, gpointe
FillTileData *data = g_task_get_task_data (task);
g_autoptr(GdkTexture) texture = NULL;
g_autoptr(GdkPixbuf) pixbuf = NULL;
- GError *error = NULL;
+ g_autoptr(GError) error = NULL;
pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
if (error != NULL)
{
- g_task_return_error (task, error);
+ g_task_return_error (task, g_steal_pointer (&error));
return;
}
@@ -842,13 +842,13 @@ on_message_sent (GObject *source_object, GAsyncResult *res, gpointer user_data)
FillTileData *data = g_task_get_task_data (task);
GCancellable *cancellable = g_task_get_cancellable (task);
g_autoptr(GInputStream) input_stream = NULL;
- GError *error = NULL;
+ g_autoptr(GError) error = NULL;
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (data->self);
input_stream = soup_session_send_finish (priv->soup_session, res, &error);
if (error != NULL)
{
- g_task_return_error (task, error);
+ g_task_return_error (task, g_steal_pointer (&error));
return;
}
@@ -879,7 +879,7 @@ on_message_sent (GObject *source_object, GAsyncResult *res, gpointer user_data)
/* Verify if the server sent an etag and save it */
g_clear_pointer (&data->etag, g_free);
data->etag = g_strdup (soup_message_headers_get_one (data->msg->response_headers, "ETag"));
- DEBUG ("Received ETag %s", etag);
+ DEBUG ("Received ETag %s", data->etag);
gdk_pixbuf_new_from_stream_async (input_stream, cancellable, on_pixbuf_created, g_object_ref (task));
}
@@ -894,7 +894,7 @@ on_pixbuf_created (GObject *source_object, GAsyncResult *res, gpointer user_data
FillTileData *data = g_task_get_task_data (task);
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (data->self);
GCancellable *cancellable = g_task_get_cancellable (task);
- GError *error = NULL;
+ g_autoptr(GError) error = NULL;
g_autoptr(GdkPixbuf) pixbuf = NULL;
g_autoptr(GdkTexture) texture = NULL;
g_autofree char *buffer = NULL;
@@ -903,15 +903,12 @@ on_pixbuf_created (GObject *source_object, GAsyncResult *res, gpointer user_data
pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
if (error != NULL)
{
- g_task_return_error (task, error);
+ g_task_return_error (task, g_steal_pointer (&error));
return;
}
if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", &error, NULL))
- {
- g_warning ("Unable to export tile: %s", error->message);
- g_clear_pointer (&error, g_error_free);
- }
+ g_warning ("Unable to export tile: %s", error->message);
else
{
g_autoptr(GBytes) bytes = g_bytes_new_take (g_steal_pointer (&buffer), buffer_size);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]