From 45d85850235bbcb6b59b1443d22f0e8203cce566 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 30 Jul 2019 15:20:18 +0200 Subject: Build either with gupnp version 1.0 or 1.2. This fixes https://github.com/mate-desktop/caja-extensions/issues/52. * (configure.ac): Check also for gupnp-1.2 and set HAS_GUPNP_VERSION_1_2 to yes if found. * (sendto/plugins/upnp/upnp.c): Use gupnp_context_manager_create when building with gupnp-1.2 as gupnp_context_manager_new was removed. Signed-off-by: Jonathan Brielmaier Co-authored-by: Gianfranco Costamagna --- configure.ac | 2 ++ sendto/plugins/upnp/upnp.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 96b3578..0594115 100644 --- a/configure.ac +++ b/configure.ac @@ -196,6 +196,8 @@ if test "x$enable_sendto" = "xyes"; then fi ;; upnp) + PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED, + enable_upnp=yes AC_DEFINE([HAS_GUPNP_VERSION_1_2], 1, ["Version is at least 1.2"]), enable_upnp=no) PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED, enable_upnp=yes, enable_upnp=no) if test "${enable_upnp}" != "yes" ; then diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c index b381587..81a4f0a 100644 --- a/sendto/plugins/upnp/upnp.c +++ b/sendto/plugins/upnp/upnp.c @@ -206,7 +206,11 @@ init (NstPlugin *plugin) return FALSE; g_free (upload_cmd); +#ifdef HAS_GUPNP_VERSION_1_2 + context_manager = gupnp_context_manager_create (0); +#else context_manager = gupnp_context_manager_new (NULL, 0); +#endif g_assert (context_manager != NULL); g_signal_connect (context_manager, "context-available", G_CALLBACK (on_context_available), NULL); -- cgit v1.2.1