[Spice-commits] 2 commits - configure.ac gtk/spice-session.c

[Christophe Fergau]

 configure.ac        |    8 ++++----
 gtk/spice-session.c |    9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit f0a423db8e98cab914871eb3eb2a8af252a371d8
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Apr 12 11:31:11 2013 +0200

    Fix setting of SPICE_{GLIB,GTK}_REQUIRES
    
    Because of a typo (REQUIRED vs REQUIRES), these variables only
    contained the last require that was set rather than a concatenation
    of all the needed libraries.

diff --git a/configure.ac b/configure.ac
index ae83f9d..8ab5b6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,18 +95,18 @@ SPICE_GTK_REQUIRES=""
 PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
 AC_SUBST(PIXMAN_CFLAGS)
 AC_SUBST(PIXMAN_LIBS)
-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRED} pixman-1 >= 0.17.7"
+SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} pixman-1 >= 0.17.7"
 
 PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
 AC_SUBST(CELT051_CFLAGS)
 AC_SUBST(CELT051_LIBS)
 AC_SUBST(CELT051_LIBDIR)
-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRED} celt051 >= 0.5.1.1"
+SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} celt051 >= 0.5.1.1"
 
 PKG_CHECK_MODULES(SSL, openssl)
 AC_SUBST(SSL_CFLAGS)
 AC_SUBST(SSL_LIBS)
-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRED} openssl"
+SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
 
 dnl Cyrus SASL
 AC_ARG_WITH([sasl],
@@ -189,7 +189,7 @@ AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
 PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
-SPICE_GTK_REQUIRES="${SPICE_GLIB_REQUIRED} gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
+SPICE_GTK_REQUIRES="${SPICE_GTK_REQUIRES} gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
 
 PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no])
 AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])])
commit 93ea4c3983c3940dafdd4e5a8abc06076be8779a
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Sat Apr 13 13:18:59 2013 +0200

    Fix GNetworkAddress leak when opening spice session

diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index 7c5169c..f46ac01 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -1745,8 +1745,13 @@ static gboolean open_host_idle_cb(gpointer data)
                                         proxy_lookup_ready, open_host);
     else
 #endif
-        open_host_connectable_connect(open_host,
-                                      g_network_address_new(s->host, open_host->port));
+    {
+        GSocketConnectable *address;
+
+        address = g_network_address_new(s->host, open_host->port);
+        open_host_connectable_connect(open_host, address);
+        g_object_unref(address);
+    }
 
     SPICE_DEBUG("open host %s:%d", s->host, open_host->port);
     if (open_host->proxy != NULL) {