Commit c1dfde27 authored by Florian Müllner's avatar Florian Müllner Committed by Florian Müllner

lib: Use more g_auto()

!101
parent dbb428c0
Pipeline #67486 passed with stages
in 6 minutes and 24 seconds
...@@ -299,7 +299,7 @@ update_self_nick (PolariRoom *room) ...@@ -299,7 +299,7 @@ update_self_nick (PolariRoom *room)
{ {
PolariRoomPrivate *priv = room->priv; PolariRoomPrivate *priv = room->priv;
const char *nick; const char *nick;
char *basenick; g_autofree char *basenick = NULL;
g_clear_pointer (&priv->self_nick, g_free); g_clear_pointer (&priv->self_nick, g_free);
...@@ -340,8 +340,6 @@ update_self_nick (PolariRoom *room) ...@@ -340,8 +340,6 @@ update_self_nick (PolariRoom *room)
priv->self_nick = g_strdup (priv->self_user); priv->self_nick = g_strdup (priv->self_user);
else else
priv->self_nick = g_strdup (basenick); priv->self_nick = g_strdup (basenick);
g_free (basenick);
} }
static void static void
...@@ -564,7 +562,8 @@ on_contact_info_ready (GObject *source, ...@@ -564,7 +562,8 @@ on_contact_info_ready (GObject *source,
{ {
PolariRoom *room = data; PolariRoom *room = data;
PolariRoomPrivate *priv = room->priv; PolariRoomPrivate *priv = room->priv;
GList *infos, *l; g_autolist (TpContactInfoField) infos = NULL;
GList *l;
infos = tp_contact_dup_contact_info (TP_CONTACT (source)); infos = tp_contact_dup_contact_info (TP_CONTACT (source));
for (l = infos; l; l = l->next) for (l = infos; l; l = l->next)
...@@ -583,7 +582,6 @@ on_contact_info_ready (GObject *source, ...@@ -583,7 +582,6 @@ on_contact_info_ready (GObject *source,
} }
break; break;
} }
tp_contact_info_list_free (infos);
} }
static void static void
......
...@@ -24,5 +24,6 @@ G_BEGIN_DECLS ...@@ -24,5 +24,6 @@ G_BEGIN_DECLS
G_DEFINE_AUTOPTR_CLEANUP_FUNC (TpAutomaticClientFactory, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC (TpAutomaticClientFactory, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC (TpMessage, 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 G_END_DECLS
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment