AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use g_clear_object()

Browse Source
This commit is contained in:
Cosimo Cecchi 2013-01-21 17:07:12 -05:00
parent a97a5d3049
commit 7fa38fd6fb
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkplacessidebar.c
View File

@ -1737,21 +1737,11 @@ get_selection_info (GtkPlacesSidebar *sidebar, SelectionInfo *info)
static void
free_selection_info (SelectionInfo *info)
{
if (info->drive)
g_object_unref (info->drive);
g_clear_object (&info->drive);
g_clear_object (&info->volume);
g_clear_object (&info->mount);
if (info->volume)
g_object_unref (info->volume);
if (info->mount)
g_object_unref (info->mount);
g_free (info->uri);
info->drive = NULL;
info->volume = NULL;
info->mount = NULL;
info->uri = NULL;
g_clear_pointer (&info->uri, g_free);
}
typedef struct {
@ -1951,10 +1941,8 @@ open_selected_bookmark (GtkPlacesSidebar *sidebar,
g_object_unref (mount_op);
}
if (drive != NULL)
g_object_unref (drive);
if (volume != NULL)
g_object_unref (volume);
g_clear_object (&drive);
g_clear_object (&volume);
}
}
@ -2422,12 +2410,9 @@ eject_or_unmount_bookmark (GtkPlacesSidebar *sidebar,
ret = TRUE;
}
if (mount != NULL)
g_object_unref (mount);
if (volume != NULL)
g_object_unref (volume);
if (drive != NULL)
g_object_unref (drive);
g_clear_object (&mount);
g_clear_object (&volume);
g_clear_object (&drive);
return ret;
}