[telepathy-mission-control/master] McdDispatcher: don't leak a ref to the AM when a channel is requested via the CD

Simon McVittie simon.mcvittie at collabora.co.uk
Thu May 28 03:47:28 PDT 2009


This isn't significant "in real life", only when using valgrind/refdbg.
---
 src/mcd-dispatcher.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index d9d9cf2..0c2d6ea 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -3574,11 +3574,14 @@ dispatcher_request_channel (McdDispatcher *self,
     /* We've done all we need to with this channel: the ChannelRequests code
      * keeps it alive as long as is necessary */
     g_object_unref (channel);
-    return;
+    goto finally;
 
 despair:
     dbus_g_method_return_error (context, error);
     g_error_free (error);
+
+finally:
+    g_object_unref (am);
 }
 
 static void
-- 
1.5.6.5




More information about the telepathy-commits mailing list