diff options
| author | Rick Bell <richard.s.bell@intel.com> | 2019-04-04 23:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 23:01:11 +0000 |
| commit | 75be576eaa10ac6fa94ca5cdaea433a6da8d3a05 (patch) | |
| tree | c27762b3b96a3d901bb2eebd3dcbd97043b598d3 | |
| parent | 1c6853f5bc697dc0a8774fd70dbc915c4dbe7c5b (diff) | |
| download | dleyna-core-revert-52-gupnp-1.2.tar.gz | |
Revert "Port to gupnp-1.2"revert-52-gupnp-1.2
| -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, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9f769e2..9a96c84 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.2 >= 1.2.0]) +PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5]) # 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 52b718e..966a8e1 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.2 +Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0 Version: @VERSION@ diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c index 9716b06..3642a5b 100644 --- a/libdleyna/core/main-loop.c +++ b/libdleyna/core/main-loop.c @@ -128,6 +128,10 @@ 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 fb113c3..e0ca2df 100644 --- a/libdleyna/core/service-task.c +++ b/libdleyna/core/service-task.c @@ -103,7 +103,6 @@ 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; |