[gnome-photos] media-server-item: Use g_auto*
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] media-server-item: Use g_auto*
- Date: Tue, 21 Nov 2017 12:20:20 +0000 (UTC)
commit a522a25e7814b42cd553c363de78e7144e9696a1
Author: Ekta Nandwani <mailnandwaniekta gmail com>
Date: Sun Oct 15 18:02:17 2017 +0530
media-server-item: Use g_auto*
https://bugzilla.gnome.org/show_bug.cgi?id=788174
src/photos-media-server-item.c | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/src/photos-media-server-item.c b/src/photos-media-server-item.c
index 5051d8b..15c3e05 100644
--- a/src/photos-media-server-item.c
+++ b/src/photos-media-server-item.c
@@ -57,7 +57,7 @@ G_DEFINE_TYPE_WITH_CODE (PhotosMediaServerItem, photos_media_server_item, PHOTOS
static gchar *
photos_media_server_item_create_filename_fallback (PhotosBaseItem *item)
{
- GFile *file = NULL;
+ g_autoptr (GFile) file = NULL;
const gchar *uri;
gchar *ret_val;
@@ -65,7 +65,6 @@ photos_media_server_item_create_filename_fallback (PhotosBaseItem *item)
file = g_file_new_for_uri (uri);
ret_val = g_file_get_basename (file);
- g_object_unref (file);
return ret_val;
}
@@ -81,7 +80,7 @@ photos_media_server_item_create_name_fallback (PhotosBaseItem *item)
static gboolean
photos_media_server_item_create_thumbnail (PhotosBaseItem *item, GCancellable *cancellable, GError **error)
{
- GFile *file;
+ g_autoptr (GFile) file = NULL;
GQuark orientation;
gboolean ret_val;
const gchar *mime_type;
@@ -108,7 +107,6 @@ photos_media_server_item_create_thumbnail (PhotosBaseItem *item, GCancellable *c
cancellable,
error);
- g_object_unref (file);
return ret_val;
}
@@ -116,13 +114,13 @@ photos_media_server_item_create_thumbnail (PhotosBaseItem *item, GCancellable *c
static gchar *
photos_media_server_item_download (PhotosBaseItem *item, GCancellable *cancellable, GError **error)
{
- GFile *local_file = NULL;
- GFile *remote_file = NULL;
+ g_autoptr (GFile) local_file = NULL;
+ g_autoptr (GFile) remote_file = NULL;
const gchar *cache_dir;
const gchar *uri;
- gchar *local_dir = NULL;
- gchar *local_filename = NULL;
- gchar *local_path = NULL;
+ g_autofree gchar *local_dir = NULL;
+ g_autofree gchar *local_filename = NULL;
+ g_autofree gchar *local_path = NULL;
gchar *ret_val = NULL;
uri = photos_base_item_get_uri (item);
@@ -152,15 +150,9 @@ photos_media_server_item_download (PhotosBaseItem *item, GCancellable *cancellab
}
}
- ret_val = local_path;
- local_path = NULL;
+ ret_val = g_steal_pointer (&local_path);
out:
- g_free (local_path);
- g_free (local_filename);
- g_free (local_dir);
- g_object_unref (local_file);
- g_object_unref (remote_file);
return ret_val;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]