[polari/wip/fmuellner/more-auto: 2/2] lib: Use more g_auto()

[Florian Müllner <fmuellner src gnome org>]

commit c1dfde27eb090494a1983628fadb9f39dd1dc577
Author: Florian Müllner <fmuellner gnome org>
Date:   Mon Mar 11 01:31:26 2019 +0100

    lib: Use more g_auto()
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/101

 src/lib/polari-room.c           | 8 +++-----
 src/lib/polari-tp-autocleanup.h | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/lib/polari-room.c b/src/lib/polari-room.c
index 4ddc668..0a9d5d0 100644
--- a/src/lib/polari-room.c
+++ b/src/lib/polari-room.c
@@ -299,7 +299,7 @@ update_self_nick (PolariRoom *room)
 {
   PolariRoomPrivate *priv = room->priv;
   const char *nick;
-  char *basenick;
+  g_autofree char *basenick = NULL;
 
   g_clear_pointer (&priv->self_nick, g_free);
 
@@ -340,8 +340,6 @@ update_self_nick (PolariRoom *room)
     priv->self_nick = g_strdup (priv->self_user);
   else
     priv->self_nick = g_strdup (basenick);
-
-  g_free (basenick);
 }
 
 static void
@@ -564,7 +562,8 @@ on_contact_info_ready (GObject      *source,
 {
   PolariRoom *room = data;
   PolariRoomPrivate *priv = room->priv;
-  GList *infos, *l;
+  g_autolist (TpContactInfoField) infos = NULL;
+  GList *l;
 
   infos = tp_contact_dup_contact_info (TP_CONTACT (source));
   for (l = infos; l; l = l->next)
@@ -583,7 +582,6 @@ on_contact_info_ready (GObject      *source,
         }
       break;
     }
-  tp_contact_info_list_free (infos);
 }
 
 static void
diff --git a/src/lib/polari-tp-autocleanup.h b/src/lib/polari-tp-autocleanup.h
index d3716c4..84a01e3 100644
--- a/src/lib/polari-tp-autocleanup.h
+++ b/src/lib/polari-tp-autocleanup.h
@@ -24,5 +24,6 @@ G_BEGIN_DECLS
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (TpAutomaticClientFactory, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (TpMessage, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (TpContactInfoField, tp_contact_info_field_free)
 
 G_END_DECLS