From: Victor Toso <me@xxxxxxxxxxxxxx>
At the moment:
- Fedora 26 has 2.52
- Fedora 25 has 2.50
- Fedora 24 has 2.48
- CentOS 7 has 2.46
- Debian 9 has 2.50
Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx>
---
configure.ac | 4 ++--
src/spice-pulse.c | 20 --------------------
tests/uri.c | 5 -----
3 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index f915d81..20afe07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,8 +182,8 @@ fi
AC_CHECK_FUNCS(clearenv strtok_r)
# Keep these two definitions in agreement.
-GLIB2_REQUIRED="2.36"
-GLIB2_ENCODED_VERSION="GLIB_VERSION_2_36"
+GLIB2_REQUIRED="2.46"
+GLIB2_ENCODED_VERSION="GLIB_VERSION_2_46"
PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED)
GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION \
diff --git a/src/spice-pulse.c b/src/spice-pulse.c
index 5248bc3..75a3dbb 100644
--- a/src/spice-pulse.c
+++ b/src/spice-pulse.c
@@ -940,27 +940,7 @@ static void cancel_task(GCancellable *cancellable, gpointer user_data)
{
struct async_task *task = user_data;
g_return_if_fail(task != NULL);
-
-#if GLIB_CHECK_VERSION(2,40,0)
free_async_task(task);
-#else
- /* This must be done now otherwise pulseaudio may return to a
- * cancelled task operation before free_async_task is called */
- if (task->pa_op != NULL) {
- pa_operation_cancel(task->pa_op);
- g_clear_pointer(&task->pa_op, pa_operation_unref);
- }
-
- /* Clear the pending_restore_task reference to avoid triggering a
- * pa_operation when context state is in READY state */
- if (task->pulse->priv->pending_restore_task == task) {
- task->pulse->priv->pending_restore_task = NULL;
- }
-
- /* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=705395
- * Free the memory in idle */
- g_idle_add(free_async_task, task);
-#endif
}
static void complete_task(SpicePulse *pulse, struct async_task *task, const gchar *err_msg)
diff --git a/tests/uri.c b/tests/uri.c
index 5bfed2d..ea8b794 100644
--- a/tests/uri.c
+++ b/tests/uri.c
@@ -19,11 +19,6 @@
#include <spice-client.h>
#include "spice-uri-priv.h"
-/* GLIB_CHECK_VERSION(2, 40, 0) */
-#ifndef g_assert_nonnull
-#define g_assert_nonnull g_assert
-#endif
-
struct test_case {
gchar *uri;
gchar *scheme;
--
2.13.0
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel