[totem] save-file: Use g_clear_pointer()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] save-file: Use g_clear_pointer()
- Date: Wed, 8 May 2013 10:37:22 +0000 (UTC)
commit abd29f4a73d5cd2a586867f6f1350f8244a71077
Author: Bastien Nocera <hadess hadess net>
Date: Tue May 7 19:05:36 2013 +0200
save-file: Use g_clear_pointer()
src/plugins/save-file/totem-save-file.c | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/src/plugins/save-file/totem-save-file.c b/src/plugins/save-file/totem-save-file.c
index f4cfc29..28148ef 100644
--- a/src/plugins/save-file/totem-save-file.c
+++ b/src/plugins/save-file/totem-save-file.c
@@ -184,10 +184,8 @@ static void
totem_save_file_file_closed (TotemObject *totem,
TotemSaveFilePlugin *pi)
{
- g_free (pi->priv->mrl);
- pi->priv->mrl = NULL;
- g_free (pi->priv->name);
- pi->priv->name = NULL;
+ g_clear_pointer (&pi->priv->mrl, g_free);
+ g_clear_pointer (&pi->priv->name, g_free);
g_simple_action_set_enabled (G_SIMPLE_ACTION (pi->priv->action), FALSE);
}
@@ -197,12 +195,8 @@ totem_save_file_file_opened (TotemObject *totem,
const char *mrl,
TotemSaveFilePlugin *pi)
{
- if (pi->priv->mrl != NULL) {
- g_free (pi->priv->mrl);
- pi->priv->mrl = NULL;
- g_free (pi->priv->name);
- pi->priv->name = NULL;
- }
+ g_clear_pointer (&pi->priv->mrl, g_free);
+ g_clear_pointer (&pi->priv->name, g_free);
if (mrl == NULL)
return;
@@ -301,10 +295,7 @@ impl_deactivate (PeasActivatable *plugin)
priv->totem = NULL;
priv->bvw = NULL;
- g_free (priv->mrl);
- priv->mrl = NULL;
- g_free (priv->name);
- priv->name = NULL;
- g_free (priv->save_uri);
- priv->save_uri = NULL;
+ g_clear_pointer (&pi->priv->mrl, g_free);
+ g_clear_pointer (&pi->priv->name, g_free);
+ g_clear_pointer (&pi->priv->save_uri, g_free);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]