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

background: Use g_autoptr to remove an explicit unref

Browse source
This commit is contained in:
Robert Ancell 2019-10-15 17:12:13 +13:00 • committed by Georges Basile Stavracas Neto
parent 1ac9a954a7
commit ff342dfbc7
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
panels/background/bg-recent-source.c
View file

@ -331,7 +331,8 @@ on_file_copied_cb (GObject *source,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
BgRecentSource *self = BG_RECENT_SOURCE (user_data); g_autoptr(BgRecentSource) self = BG_RECENT_SOURCE (user_data);
g_autofree gchar *original_file = NULL;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
g_file_copy_finish (G_FILE (source), result, &error); g_file_copy_finish (G_FILE (source), result, &error);
@ -340,14 +341,11 @@ on_file_copied_cb (GObject *source,
{ {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_critical ("Failed to copy file: %s", error->message); g_critical ("Failed to copy file: %s", error->message);
} return;
else
{
g_autofree gchar *original_file = g_file_get_path (G_FILE (source));
g_debug ("Successfully copied wallpaper: %s", original_file);
} }
g_object_unref (self); original_file = g_file_get_path (G_FILE (source));
g_debug ("Successfully copied wallpaper: %s", original_file);
} }
static void static void
@ -355,7 +353,8 @@ on_file_deleted_cb (GObject *source,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
BgRecentSource *self = BG_RECENT_SOURCE (user_data); g_autoptr(BgRecentSource) self = BG_RECENT_SOURCE (user_data);
g_autofree gchar *original_file = NULL;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
g_file_delete_finish (G_FILE (source), result, &error); g_file_delete_finish (G_FILE (source), result, &error);
@ -364,14 +363,11 @@ on_file_deleted_cb (GObject *source,
{ {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_critical ("Failed to delete wallpaper: %s", error->message); g_critical ("Failed to delete wallpaper: %s", error->message);
} return;
else
{
g_autofree gchar *original_file = g_file_get_path (G_FILE (source));
g_debug ("Successfully deleted wallpaper: %s", original_file);
} }
g_object_unref (self); original_file = g_file_get_path (G_FILE (source));
g_debug ("Successfully deleted wallpaper: %s", original_file);
} }
/* GObject overrides */ /* GObject overrides */