[Spice-commits] 2 commits - gtk/giopipe.c gtk/Makefile.am

[Marc-André Lureau]

 gtk/Makefile.am |    6 ------
 gtk/giopipe.c   |    5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 78c6177f7b697a4734ad4f783ad961ae6e11ee7a
Author: Benjamin Gilbert <bgilbert at cs.cmu.edu>
Date:   Wed May 20 17:39:08 2015 -0400

    Drop expansions of removed CFLAGS/LIBS variables

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e1d5d93..25e2255 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -88,15 +88,12 @@ SPICE_COMMON_CPPFLAGS =						\
 	-I$(top_srcdir)						\
 	$(COMMON_CFLAGS)					\
 	$(PIXMAN_CFLAGS)					\
-	$(CELT051_CFLAGS)					\
-	$(OPUS_CFLAGS)  					\
 	$(PULSE_CFLAGS)						\
 	$(GTK_CFLAGS)						\
 	$(CAIRO_CFLAGS)						\
 	$(GLIB2_CFLAGS)						\
 	$(GIO_CFLAGS)						\
 	$(GOBJECT2_CFLAGS)					\
-	$(DBUS_GLIB_CFLAGS)					\
 	$(SSL_CFLAGS)						\
 	$(SASL_CFLAGS)						\
 	$(GST_CFLAGS)						\
@@ -124,7 +121,6 @@ SPICE_GTK_LIBADD_COMMON =		\
 	libspice-client-glib-2.0.la	\
 	$(GTK_LIBS)			\
 	$(CAIRO_LIBS)			\
-	$(DBUS_GLIB_LIBS)		\
 	$(XRANDR_LIBS)			\
 	$(LIBM)				\
 	$(NULL)
@@ -205,8 +201,6 @@ libspice_client_glib_2_0_la_LIBADD =					\
 	$(SOUP_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GOBJECT2_LIBS)						\
-	$(CELT051_LIBS)							\
-	$(OPUS_LIBS)							\
 	$(JPEG_LIBS)							\
 	$(Z_LIBS)							\
 	$(LZ4_LIBS)							\
commit bbfb15623008a2b5cbff239e17464e87b59e9514
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed May 20 13:05:58 2015 +0200

    iopipe: fix leak of streams
    
    g_simple_io_stream_new() do not steal references from us, unref the
    streams to avoid the leaks.
    
    Leak found by Victor Toso.
    
    ==30787== 2,808 (648 direct, 2,160 indirect) bytes in 9 blocks are definitely lost in loss record 479 of 482
    ==30787==    at 0x93AEBFD: g_type_create_instance (gtype.c:1849)
    ==30787==    by 0x939128A: g_object_new_internal (gobject.c:1774)
    ==30787==    by 0x9392AA0: g_object_newv (gobject.c:1921)
    ==30787==    by 0x939338B: g_object_new (gobject.c:1614)
    ==30787==    by 0x403B30: make_gio_pipe (giopipe.c:441)
    ==30787==    by 0x403C8E: spice_make_pipe (giopipe.c:465)
    ==30787==    by 0x4029B5: fixture_set_up (pipe.c:42)
    ==30787==    by 0x9844EC8: test_case_run (gtestutils.c:2123)
    ==30787==    by 0x9844EC8: g_test_run_suite_internal (gtestutils.c:2185)
    ==30787==    by 0x984509A: g_test_run_suite_internal (gtestutils.c:2196)
    ==30787==    by 0x98453FA: g_test_run_suite (gtestutils.c:2249)
    ==30787==    by 0x9845430: g_test_run (gtestutils.c:1553)
    ==30787==    by 0x402012: main (pipe.c:312)

diff --git a/gtk/giopipe.c b/gtk/giopipe.c
index 440cae9..50edb5b 100644
--- a/gtk/giopipe.c
+++ b/gtk/giopipe.c
@@ -473,4 +473,9 @@ spice_make_pipe(GIOStream **p1, GIOStream **p2)
 
     *p1 = g_simple_io_stream_new(in1, out1);
     *p2 = g_simple_io_stream_new(in2, out2);
+
+    g_object_unref(in1);
+    g_object_unref(in2);
+    g_object_unref(out1);
+    g_object_unref(out2);
 }