diff options
| author | Rick Bell <richard.s.bell@intel.com> | 2019-04-04 15:27:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 15:27:31 -0700 |
| commit | 1c6853f5bc697dc0a8774fd70dbc915c4dbe7c5b (patch) | |
| tree | 7111f7d3f9c4843f9c271a4925ce8cceb8da5840 | |
| parent | 32207688478b890c91eb084a84f96b40a729ab14 (diff) | |
| parent | 41b2e56f67b6fc9c8c256b86957d281644b9b846 (diff) | |
| download | dleyna-core-1c6853f5bc697dc0a8774fd70dbc915c4dbe7c5b.tar.gz | |
Merge pull request #52 from jtojnar/gupnp-1.2
Port to gupnp-1.2
This has been approved
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dleyna-core-1.0.pc.in | 2 | ||||
| -rw-r--r-- | libdleyna/core/main-loop.c | 4 | ||||
| -rw-r--r-- | libdleyna/core/service-task.c | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 9a96c84..9f769e2 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ PKG_PROG_PKG_CONFIG(0.16) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.28]) -PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5]) +PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0]) # Checks for header files. AC_CHECK_HEADERS([stdlib.h string.h syslog.h]) diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in index 966a8e1..52b718e 100644 --- a/dleyna-core-1.0.pc.in +++ b/dleyna-core-1.0.pc.in @@ -8,5 +8,5 @@ Name: @PACKAGE@ Description: UPnP & DLNA core library Libs: -L${libdir} -ldleyna-core-1.0 Cflags: -I${includedir}/dleyna-1.0 -Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0 +Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2 Version: @VERSION@ diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c index 3642a5b..9716b06 100644 --- a/libdleyna/core/main-loop.c +++ b/libdleyna/core/main-loop.c @@ -128,10 +128,6 @@ int dleyna_main_loop_start(const char *server, { int retval = 1; -#if !GLIB_CHECK_VERSION(2, 35, 0) - g_type_init(); -#endif - dleyna_log_init(server, control_point->get_version()); if (!prv_context_init(server, control_point)) diff --git a/libdleyna/core/service-task.c b/libdleyna/core/service-task.c index e0ca2df..fb113c3 100644 --- a/libdleyna/core/service-task.c +++ b/libdleyna/core/service-task.c @@ -103,6 +103,7 @@ void dleyna_service_task_cancel_cb(dleyna_task_atom_t *atom, gpointer user_data) if (task->p_action) { if (task->proxy) + // TODO: switch to GCancellable gupnp_service_proxy_cancel_action(task->proxy, task->p_action); task->p_action = NULL; |