[Spice-commits] 5 commits - configure.ac m4/check_python.m4 spice-common src/channel-main.c src/keycodemapdb src/Makefile.am
Pavel Grunt
pgrunt at kemper.freedesktop.org
Fri Mar 10 16:03:37 UTC 2017
configure.ac | 2 +-
m4/check_python.m4 | 46 ----------------------------------------------
spice-common | 2 +-
src/Makefile.am | 5 +++--
src/channel-main.c | 12 ++++++++++++
src/keycodemapdb | 2 +-
6 files changed, 18 insertions(+), 51 deletions(-)
New commits:
commit 40b0dbf3175ed8c5dba7f5a8058774c3aec93d9c
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Fri Mar 10 08:20:53 2017 +0100
main: Handle disabled file transfer
File transfer can be disabled by the server or agent, it is
signalized by the VD_AGENT_CAP_FILE_XFER_DISABLED set.
Do not try to transfer files when the capability is set.
Related: rhbz#1373725
Acked-by: Victor Toso <victortoso at redhat.com>
diff --git a/src/channel-main.c b/src/channel-main.c
index cd3dee7..be7c852 100644
--- a/src/channel-main.c
+++ b/src/channel-main.c
@@ -225,6 +225,7 @@ static const char *agent_caps[] = {
[ VD_AGENT_CAP_MAX_CLIPBOARD ] = "max-clipboard",
[ VD_AGENT_CAP_AUDIO_VOLUME_SYNC ] = "volume-sync",
[ VD_AGENT_CAP_MONITORS_CONFIG_POSITION ] = "monitors config position",
+ [ VD_AGENT_CAP_FILE_XFER_DISABLED ] = "file transfer disabled",
};
#define NAME(_a, _i) ((_i) < SPICE_N_ELEMENTS(_a) ? (_a[(_i)] ?: "?") : "?")
@@ -3097,6 +3098,17 @@ void spice_main_file_copy_async(SpiceMainChannel *channel,
return;
}
+ if (test_agent_cap(channel, VD_AGENT_CAP_FILE_XFER_DISABLED)) {
+ g_task_report_new_error(channel,
+ callback,
+ user_data,
+ spice_main_file_copy_async,
+ SPICE_CLIENT_ERROR,
+ SPICE_CLIENT_ERROR_FAILED,
+ _("The file transfer is disabled"));
+ return;
+ }
+
xfer_op = g_new0(FileTransferOperation, 1);
xfer_op->channel = channel;
xfer_op->progress_callback = progress_callback;
commit fa1cdcd612ff592b80ad375a37e2eda6db949ba5
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Fri Mar 10 10:21:36 2017 +0100
build-sys: Use AM_PATH_PYTHON to find PYTHON interpreter
It is more suitable for the task than AC_PATH_PROGS
Also it prevents us from forcing a version of Python
https://www.gnu.org/software/automake/manual/html_node/Python.html
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
Acked-by: Marc-André Lureau <mlureau at redhat.com>
diff --git a/configure.ac b/configure.ac
index 763d14b..ad5e6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_CANONICAL_HOST
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
AC_C_BIGENDIAN
-AC_PATH_PROGS(PYTHON, python2 python)
+AM_PATH_PYTHON(,, [:])
RRA_LD_VERSION_SCRIPT
AC_MSG_CHECKING([for native Win32])
commit 3ce62cadec88f25539f71cdfa61f612509f5fe6e
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Fri Mar 10 10:27:37 2017 +0100
m4: Drop unused AM_CHECK_PYTHON_HEADERS
Unused since we dropped python bindings
0917002c48a0a5deb615d120a0e5997eefc89fd4
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/m4/check_python.m4 b/m4/check_python.m4
deleted file mode 100644
index 16fb49c..0000000
--- a/m4/check_python.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-# serial 3
-# Find valid warning flags for the C Compiler. -*-Autoconf-*-
-#
-# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-# Written by Jesse Thilo.
-
-dnl a macro to check for ability to create python extensions
-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
- [AC_REQUIRE([AM_PATH_PYTHON])
- AC_MSG_CHECKING(for headers required to compile python extensions)
- dnl deduce PYTHON_INCLUDES
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
- fi
- AC_SUBST(PYTHON_INCLUDES)
- dnl check if the headers exist:
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
- AC_TRY_CPP([#include <Python.h>],dnl
- [AC_MSG_RESULT(found)
- $1],dnl
- [AC_MSG_RESULT(not found)
- $2])
- CPPFLAGS="$save_CPPFLAGS"
-])
commit f02017300682d3bd18ee7b66e0ea150a91e53a8a
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Fri Mar 10 13:02:01 2017 +0100
Update submodules
Allow to compile without warnings with the new OpenSSL
Add missing import in the keymap generator
spice-common:
Frediano Ziglio (1):
region: Avoid possible memory corruption
Jonathon Jongsma (1):
Document REGION_TEST_* bitmasks
Sebastian Andrzej Siewior (1):
ssl: Use ASN1_STRING_get0_data instead of ASN1_STRING_data
keycodemapdb:
Daniel P. Berrange (1):
Add ability to generate Perl POD docs for key map names & values
Pavel Grunt (1):
keymap-gen: Import sys
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/spice-common b/spice-common
index 30e8237..4423ea5 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 30e8237934b4060513bd0bdcc5ea0caa1dcc7b59
+Subproject commit 4423ea5d2ad5596533dddf83ac1c11660c9e0ca4
diff --git a/src/keycodemapdb b/src/keycodemapdb
index b2976e7..1a6aaf8 160000
--- a/src/keycodemapdb
+++ b/src/keycodemapdb
@@ -1 +1 @@
-Subproject commit b2976e7ed714400a3967ebb430bda45d1c253c20
+Subproject commit 1a6aaf853ff7202b869dc7868f800ed7da9538d0
commit 091613f3c6a8cc2dbd5dfe24e92f641723ad7df3
Author: Pavel Grunt <pgrunt at redhat.com>
Date: Fri Mar 10 12:58:40 2017 +0100
dist: Keep generated keymaps
spice-gtk does not have to require python
Regression since 271222e2217bf82644d87649b43b920240430f8
Acked-by: Christophe Fergeau <cfergeau at redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 11d0de6..4fa7357 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,8 +30,9 @@ BUILT_SOURCES = $(GLIBGENS) $(KEYMAPS)
EXTRA_DIST = \
decode-glz-tmpl.c \
- $(KEYMAP_CSV) \
- $(KEYMAP_GEN) \
+ $(KEYMAPS) \
+ $(KEYMAP_CSV) \
+ $(KEYMAP_GEN) \
map-file \
spice-glib-sym-file \
spice-gtk-sym-file \
More information about the Spice-commits
mailing list