Merge branch 'memory-leaks'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

3 files changed, 5 insertions, 3 deletions

diff --git a/src/conn-presence.c b/src/conn-presence.c
index d9c90e793..fcbaf3d80 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -2039,6 +2039,8 @@ conn_presence_finalize (GabbleConnection *conn)
   if (priv->iq_list_push_cb != NULL)
     lm_message_handler_unref (priv->iq_list_push_cb);
 
+  g_slice_free (GabbleConnectionPresencePrivate, priv);
+
   tp_presence_mixin_finalize ((GObject *) conn);
 }
 
diff --git a/src/connection.c b/src/connection.c
index ad58ebb7d..eeec1cd16 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -3378,13 +3378,11 @@ gabble_connection_update_capabilities (
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
-  GabbleCapabilitySet *old_caps;
+  GabbleCapabilitySet *old_caps = NULL;
   TpChannelManagerIter iter;
   TpChannelManager *manager;
   guint i;
 
-  old_caps = gabble_capability_set_copy (self->priv->all_caps);
-
   /* Now that someone has told us our *actual* capabilities, we can stop
    * advertising spurious caps in initial presence */
   gabble_capability_set_clear (self->priv->bonus_caps);
diff --git a/src/roster.c b/src/roster.c
index 3a818ff0a..85b654cda 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -1756,6 +1756,8 @@ roster_received_cb (GObject *source_object,
             result, &response, &error))
         {
           got_roster_iq (self, response);
+
+          g_object_unref (response);
         }
       else
         {