Hello community,
here is the log from the commit of package vino for openSUSE:13.1 checked in at 2013-09-23 11:16:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/vino (Old)
and /work/SRC/openSUSE:13.1/.vino.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vino"
Changes:
--------
--- /work/SRC/openSUSE:13.1/vino/vino.changes 2013-09-23 11:14:23.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.vino.new/vino.changes 2013-09-23 11:18:37.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Sep 16 21:27:29 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.9.92:
+ + Fix reading of TLS data to account for cached data.
+ + Reject new clients if in the deferred state.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
vino-3.9.3.tar.xz
New:
----
vino-3.9.92.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vino.spec ++++++
--- /var/tmp/diff_new_pack.lKrGKc/_old 2013-09-23 11:18:37.000000000 +0200
+++ /var/tmp/diff_new_pack.lKrGKc/_new 2013-09-23 11:18:37.000000000 +0200
@@ -17,7 +17,7 @@
Name: vino
-Version: 3.9.3
+Version: 3.9.92
Release: 0
Summary: GNOME VNC Server
License: GPL-2.0+
++++++ vino-3.9.3.tar.xz -> vino-3.9.92.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/ChangeLog new/vino-3.9.92/ChangeLog
--- old/vino-3.9.3/ChangeLog 2013-07-08 23:39:21.000000000 +0200
+++ new/vino-3.9.92/ChangeLog 2013-09-16 22:27:33.000000000 +0200
@@ -1,3 +1,54 @@
+2013-09-16 David King
+
+ Update NEWS for 3.9.92 release
+
+2013-09-16 Daniel P. Berrange
+
+ Fix reading of TLS data to account for cached data
+
+ When you ask GnuTLS to read 'n' bytes of data it is free to read many
+ more than just 'n' bytes, since there is no 1-1 mapping between
+ encrypted and unencrypted byte counts.
+
+ The Vino I/O handle triggered when POLLIN reads one single RFB message,
+ then checks if POLLIN is still set. This is broken if gnutls has
+ previously read more than one RFB message worth of data.
+
+ A symptom of this brokeness is that when connecting to a Vino server
+ with gtk-vnc, the screen will be initially black until the user moves
+ the mouse or presses a key. Even then there will be periodic delays in
+ updates if the pending data condition arises again.
+
+ Fortunately GnuTLS has a function gnutls_record_check_pending which lets
+ apps determine if there is any cached data read off the wire.
+
+ Signed-off-by: Daniel P. Berrange
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=703326
+
+2013-09-16 Jiro Matsuzawa
+
+ l10n: Update Japanese translation
+
+2013-09-12 David King
+
+ Reject new clients if in the deferred state
+
+ As mentioned in bug 641811, Vino can get stuck trying to process the
+ same data in an infinite loop if an authentication request is received
+ from a client while that client is in the deferred state.
+
+ Avoid this situation by closing new connections from the same client
+ when it is in the deferred state.
+
+2013-08-08 Kjartan Maraas
+
+ Updated Norwegian bokmål translation
+
+2013-07-08 David King
+
+ Post-release version bump to 3.9.5
+
2013-07-08 David King
Update NEWS for 3.9.3 release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/NEWS new/vino-3.9.92/NEWS
--- old/vino-3.9.3/NEWS 2013-07-08 23:38:01.000000000 +0200
+++ new/vino-3.9.92/NEWS 2013-09-16 22:24:53.000000000 +0200
@@ -1,3 +1,19 @@
+Vino 3.9.92
+===========
+
+Daniel P. Berrange (1):
+ Fix reading of TLS data to account for cached data
+
+David King (2):
+ Post-release version bump to 3.9.5
+ Reject new clients if in the deferred state
+
+Jiro Matsuzawa (1):
+ l10n: Update Japanese translation
+
+Kjartan Maraas (1):
+ Updated Norwegian bokmål translation
+
Vino 3.9.3
==========
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/aclocal.m4 new/vino-3.9.92/aclocal.m4
--- old/vino-3.9.3/aclocal.m4 2013-07-08 23:02:39.000000000 +0200
+++ new/vino-3.9.92/aclocal.m4 2013-09-16 22:25:11.000000000 +0200
@@ -1462,6 +1462,21 @@
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
# gnome-common.m4
#
# serial 3
@@ -1518,10 +1533,20 @@
AC_SUBST(DISABLE_DEPRECATED)
])
+# gnome-compiler-flags.m4
+#
+# serial 2
+#
+
dnl GNOME_COMPILE_WARNINGS
dnl Turn on many useful compiler warnings and substitute the result into
dnl WARN_CFLAGS
dnl For now, only works on GCC
+dnl Pass the default value of the --enable-compile-warnings configure option as
+dnl the first argument to the macro, defaulting to 'yes'.
+dnl Additional warning/error flags can be passed as an optional second argument.
+dnl
+dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
AC_DEFUN([GNOME_COMPILE_WARNINGS],[
dnl ******************************
dnl More compiler warnings
@@ -1561,6 +1586,11 @@
-Werror=missing-include-dirs \
"
+ dnl Additional warning or error flags provided by the module author to
+ dnl allow stricter standards to be imposed on a per-module basis.
+ dnl The author can pass -W or -Werror flags here as they see fit.
+ additional_flags="m4_default([$2],[])"
+
case "$enable_compile_warnings" in
no)
warning_flags=
@@ -1569,10 +1599,10 @@
warning_flags="-Wall"
;;
yes)
- warning_flags="$base_warn_flags $base_error_flags"
+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
;;
maximum|error)
- warning_flags="$base_warn_flags $base_error_flags"
+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
;;
*)
AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/build-aux/config.guess new/vino-3.9.92/build-aux/config.guess
--- old/vino-3.9.3/build-aux/config.guess 2013-07-08 23:02:45.000000000 +0200
+++ new/vino-3.9.92/build-aux/config.guess 2013-09-16 22:25:12.000000000 +0200
@@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,7 +26,7 @@
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess...
@@ -50,7 +52,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,27 +136,6 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
-
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include
- #if defined(__UCLIBC__)
- LIBC=uclibc
- #elif defined(__dietlibc__)
- LIBC=dietlibc
- #else
- LIBC=gnu
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- ;;
-esac
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -874,21 +857,21 @@
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -901,54 +884,59 @@
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -967,63 +955,54 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
- exit ;;
- ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
- exit ;;
- ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1256,21 +1235,19 @@
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
- fi
- fi
+ case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/build-aux/config.sub new/vino-3.9.92/build-aux/config.sub
--- old/vino-3.9.3/build-aux/config.sub 2013-07-08 23:02:45.000000000 +0200
+++ new/vino-3.9.92/build-aux/config.sub 2013-09-16 22:25:12.000000000 +0200
@@ -1,8 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2013-04-24'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +70,9 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -252,7 +256,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arceb \
+ | arc \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
@@ -286,17 +290,16 @@
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
+ | nios | nios2 \
| ns16k | ns32k \
| open8 \
- | or1k | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -366,7 +369,7 @@
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
@@ -404,13 +407,12 @@
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -1352,7 +1354,7 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1498,6 +1500,9 @@
-aros*)
os=-aros
;;
+ -kaos*)
+ os=-kaos
+ ;;
-zvmoe)
os=-zvmoe
;;
@@ -1589,9 +1594,6 @@
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/configure new/vino-3.9.92/configure
--- old/vino-3.9.3/configure 2013-07-08 23:02:42.000000000 +0200
+++ new/vino-3.9.92/configure 2013-09-16 22:25:11.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Vino 3.9.3.
+# Generated by GNU Autoconf 2.69 for Vino 3.9.92.
#
# Report bugs to https://bugzilla.gnome.org/enter_bug.cgi?product=vino.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='Vino'
PACKAGE_TARNAME='vino'
-PACKAGE_VERSION='3.9.3'
-PACKAGE_STRING='Vino 3.9.3'
+PACKAGE_VERSION='3.9.92'
+PACKAGE_STRING='Vino 3.9.92'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=vino'
PACKAGE_URL='https://live.gnome.org/Vino'
@@ -1419,7 +1419,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Vino 3.9.3 to adapt to many kinds of systems.
+\`configure' configures Vino 3.9.92 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1493,7 +1493,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Vino 3.9.3:";;
+ short | recursive ) echo "Configuration of Vino 3.9.92:";;
esac
cat <<\_ACEOF
@@ -1646,7 +1646,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Vino configure 3.9.3
+Vino configure 3.9.92
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2015,7 +2015,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Vino $as_me 3.9.3, which was
+It was created by Vino $as_me 3.9.92, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2883,7 +2883,7 @@
# Define the identity of the package.
PACKAGE='vino'
- VERSION='3.9.3'
+ VERSION='3.9.92'
# Some tools Automake needs.
@@ -4167,6 +4167,8 @@
-Werror=missing-include-dirs \
"
+ additional_flags=""
+
case "$enable_compile_warnings" in
no)
warning_flags=
@@ -4175,10 +4177,10 @@
warning_flags="-Wall"
;;
yes)
- warning_flags="$base_warn_flags $base_error_flags"
+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
;;
maximum|error)
- warning_flags="$base_warn_flags $base_error_flags"
+ warning_flags="$base_warn_flags $base_error_flags $additional_flags"
;;
*)
as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
@@ -15787,7 +15789,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Vino $as_me 3.9.3, which was
+This file was extended by Vino $as_me 3.9.92, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15854,7 +15856,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Vino config.status 3.9.3
+Vino config.status 3.9.92
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/configure.ac new/vino-3.9.92/configure.ac
--- old/vino-3.9.3/configure.ac 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/configure.ac 2013-09-16 22:24:07.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.64])
-AC_INIT([Vino], [3.9.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [https://live.gnome.org/Vino])
+AC_INIT([Vino], [3.9.92], [https://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [https://live.gnome.org/Vino])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([server/vino-fb.c])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/po/ja.po new/vino-3.9.92/po/ja.po
--- old/vino-3.9.3/po/ja.po 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/po/ja.po 2013-09-16 22:15:44.000000000 +0200
@@ -4,16 +4,16 @@
# Satoru SATOH , 2004-2006.
# Takeshi AIHANA , 2006-2009.
# Takayuki KUSANO , 2010, 2012.
-# Jiro Matsuzawa , 2011.
+# Jiro Matsuzawa , 2011, 2013
# Hideki Yamane , 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: vino master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vino&keywords=I18N+L10N&component=Preferences Dialog\n"
-"POT-Creation-Date: 2012-08-22 08:57+0000\n"
-"PO-Revision-Date: 2012-08-22 22:51+0900\n"
-"Last-Translator: Takayuki KUSANO \n"
+"POT-Creation-Date: 2013-09-12 09:34+0000\n"
+"PO-Revision-Date: 2013-09-15 20:12+0900\n"
+"Last-Translator: Jiro Matsuzawa \n"
"Language-Team: Japanese \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@@ -21,77 +21,29 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../capplet/vino-message-box.c:55
-#, c-format
-msgid "There was an error showing the URL \"%s\""
-msgstr "\"%s\" という URL を表示する際にエラーが発生しました"
-
-#: ../capplet/vino-preferences.c:245
-#, c-format
-msgid ""
-"There was an error displaying help:\n"
-"%s"
-msgstr ""
-"ヘルプを表示する際にエラーが発生しました:\n"
-"%s"
-
-#: ../capplet/vino-preferences.c:278
-msgid "Checking the connectivity of this machine..."
-msgstr "このマシンの接続情報を確認しています..."
-
-#: ../capplet/vino-preferences.c:298
-msgid "Your desktop is only reachable over the local network."
-msgstr "お使いのデスクトップにはローカル・ネットワーク内でのみ接続できます。"
-
-#: ../capplet/vino-preferences.c:311
-msgid " or "
-msgstr " または "
-
-#: ../capplet/vino-preferences.c:315
-#, c-format
-msgid "Others can access your computer using the address %s."
-msgstr "他の人達からは %s というアドレスであなたのデスクトップにアクセスできます。"
-
-#: ../capplet/vino-preferences.c:324
-msgid "Nobody can access your desktop."
-msgstr "誰もあなたのデスクトップにはアクセスできません。"
-
-#: ../capplet/vino-preferences.desktop.in.in.h:1
-#: ../server/vino-server.desktop.in.in.h:1
-msgid "Desktop Sharing"
-msgstr "デスクトップの共有"
-
-#: ../capplet/vino-preferences.desktop.in.in.h:2
-msgid "Choose how other users can remotely view your desktop"
-msgstr "リモートからデスクトップを表示する方法を選択したり設定します"
-
-#: ../common/vino-keyring.c:54 ../tools/vino-passwd.c:54
-msgid "Remote desktop sharing password"
-msgstr "リモートデスクトップ共有のパスワード"
-
#: ../common/org.gnome.Vino.gschema.xml.h:1
msgid "Enable remote access to the desktop"
msgstr "デスクトップへのリモートアクセスを有効にする"
#: ../common/org.gnome.Vino.gschema.xml.h:2
msgid "If true, allows remote access to the desktop via the RFB protocol. Users on remote machines may then connect to the desktop using a VNC viewer."
-msgstr "TRUE にすると、RFB プロトコルを介したリモート・デスクトップのアクセスを許可します。リモート・マシンのユーザーは VNC ビューワーを使ってデスクトップに接続できます。"
+msgstr "true にすると、RFB プロトコルを介したリモートデスクトップのアクセスを許可します。リモートマシンのユーザーは VNC ビューワーを使ってデスクトップに接続できます。"
#: ../common/org.gnome.Vino.gschema.xml.h:3
msgid "Prompt the user before completing a connection"
-msgstr "接続する前にパスワード入力を求めるかどうか"
+msgstr "接続する前にパスワード入力を求める"
#: ../common/org.gnome.Vino.gschema.xml.h:4
msgid "If true, remote users accessing the desktop are not allowed access until the user on the host machine approves the connection. Recommended especially when access is not password protected."
-msgstr "TRUE にすると、リモート・ユーザーはそのホストを所有するユーザーが承認してくれるまでデスクトップに接続することはできません。特にアクセスがパスワードで保護されていない場合に推奨します。"
+msgstr "true にすると、リモートユーザーはそのホストを所有するユーザーが承認してくれるまでデスクトップに接続することはできません。特にアクセスがパスワードで保護されていない場合に推奨します。"
#: ../common/org.gnome.Vino.gschema.xml.h:5
msgid "Only allow remote users to view the desktop"
-msgstr "デスクトップの表示のみ許可するかどうか"
+msgstr "デスクトップの表示のみ許可する"
#: ../common/org.gnome.Vino.gschema.xml.h:6
msgid "If true, remote users accessing the desktop are only allowed to view the desktop. Remote users will not be able to use the mouse or keyboard."
-msgstr "TRUE にすると、リモート・ユーザーはデスクトップを参照することしかできなくなります。リモート・ユーザーはマウスやキーボードを利用することはできません。"
+msgstr "true にすると、リモートユーザーはデスクトップを参照することしかできなくなります。リモートユーザーはマウスやキーボードを利用することはできません。"
#: ../common/org.gnome.Vino.gschema.xml.h:7
msgid "Network interface for listening"
@@ -101,18 +53,18 @@
msgid ""
"If not set, the server will listen on all network interfaces.\n"
"\n"
-"Set this if you want that accept connections only from some specific network interface. eg: eth0, wifi0, lo, ..."
+"Set this if you want to accept connections only from some specific network interface. For example, eth0, wifi0, lo and so on."
msgstr ""
-"特に指定しない場合、リモート・デスクトップのサーバーはすべてのネットワーク・インターフェースを監視します。\n"
+"特に指定しない場合、リモートデスクトップのサーバーはすべてのネットワークインターフェースを監視します。\n"
"\n"
-"もし特定のネットワーク・インターフェースからのみ接続を許可したいような場合は、ここにそのネットワークインターフェースを指定してください (例: eth0、wifi0、lo 等)。"
+"特定のネットワークインターフェースからのみ接続を許可したい場合は、ここにそのネットワークインターフェースを指定してください (例: eth0、wifi0、lo 等)。"
#: ../common/org.gnome.Vino.gschema.xml.h:11
msgid "Listen on an alternative port"
-msgstr "別のポートを監視するかどうか"
+msgstr "別のポートを監視する"
#: ../common/org.gnome.Vino.gschema.xml.h:12
-msgid "If true, the server will listen to another port, instead of the default (5900). The port must be specified in the 'alternative-port' key."
+msgid "If true, the server will listen on another port, instead of the default (5900). The port must be specified in the 'alternative-port' key."
msgstr "true にすると、サーバーはデフォルトのポート (5900番) ではなく、別のポートを監視します。このポートは 'alternative-port' キーで指定してください。"
#: ../common/org.gnome.Vino.gschema.xml.h:13
@@ -120,16 +72,16 @@
msgstr "別のポート番号"
#: ../common/org.gnome.Vino.gschema.xml.h:14
-msgid "The port which the server will listen to if the 'use-alternative-port' key is set to true. Valid values are in the range from 5000 to 50000."
-msgstr "'use-alternative-port' キーが TRUE の場合に、サーバーが監視するポート番号 (5000〜50000) です。"
+msgid "The port which the server will listen to if the 'use-alternative-port' key is set to true. Valid values are in the range of 5000 to 50000."
+msgstr "'use-alternative-port' キーが true の場合に、サーバーが監視するポート番号 (5000〜50000) です。"
#: ../common/org.gnome.Vino.gschema.xml.h:15
msgid "Require encryption"
-msgstr "暗号化するかどうか"
+msgstr "暗号化を必須とする"
#: ../common/org.gnome.Vino.gschema.xml.h:16
msgid "If true, remote users accessing the desktop are required to support encryption. It is highly recommended that you use a client which supports encryption unless the intervening network is trusted."
-msgstr "TRUE にすると、リモート・ユーザーがデスクトップにアクセスするには暗号化がサポートされている必要があります。このようなアクセスを取りなすネットワークが信頼できるものでない限り、暗号化をサポートしているクライアントの使用を強く推奨します。"
+msgstr "true にすると、リモートユーザーがデスクトップにアクセスするには暗号化のサポートが必須となります。仲介するネットワークが信頼できるものでない限り、暗号化をサポートするクライアントの使用を強く推奨します。"
#: ../common/org.gnome.Vino.gschema.xml.h:17
msgid "Allowed authentication methods"
@@ -156,13 +108,13 @@
"\n"
"The special value of 'keyring' (which is not valid base64) means that the password is stored in the GNOME keyring."
msgstr ""
-"\"vnc\" の認証モードでリモート・ユーザーに要求するパスワードを指定します。この内容は base64 エンコードされます。\n"
+"\"vnc\" の認証モードでリモートユーザーに要求するパスワードを指定します。このキーの値はパスワードを base64 エンコードしたものとなります。\n"
"\n"
-"(正しい base64 ではない) 'keyring' という特別な値は、GNOME キーリングに保存されているパスワードを意味します。"
+"'keyring' という特別な値 (これは妥当な base64 ではありません) は、パスワードがGNOME キーリングに保存されていることを意味します。"
#: ../common/org.gnome.Vino.gschema.xml.h:25
msgid "E-mail address to which the remote desktop URL should be sent"
-msgstr "リモート・デスクトップ URL の送信先メールアドレス"
+msgstr "リモートデスクトップ URL の送信先メールアドレス"
#: ../common/org.gnome.Vino.gschema.xml.h:26
msgid "This key specifies the e-mail address to which the remote desktop URL should be sent if the user clicks on the URL in the Desktop Sharing preferences dialog."
@@ -170,111 +122,51 @@
#: ../common/org.gnome.Vino.gschema.xml.h:27
msgid "Lock the screen when last user disconnect"
-msgstr "接続が切れたら画面をロックするかどうか"
+msgstr "接続が切れたら画面をロックする"
#: ../common/org.gnome.Vino.gschema.xml.h:28
-msgid "If true, screen will be locked after the last remote client disconnect."
-msgstr "TRUE にすると、最後のリモート・クライアントからの接続が切れた時に画面をロックします。"
+msgid "If true, the screen will be locked after the last remote client disconnects."
+msgstr "true にすると、最後のリモートクライアントからの接続が切れた時に画面をロックします。"
#: ../common/org.gnome.Vino.gschema.xml.h:29
msgid "When the status icon should be shown"
-msgstr "ステータス・アイコンの表示方法"
+msgstr "ステータスアイコンの表示方法"
#: ../common/org.gnome.Vino.gschema.xml.h:30
-msgid "This key controls the behavior of the status icon. There are three options: \"always\" - The icon will be always there; \"client\" - You will see the icon only when there is someone connected, this is the default behavior; \"never\" - Never shows the icon."
+msgid "This key controls the behavior of the status icon. There are three options: \"always\" - the icon will always be present; \"client\" - the icon will only be present when someone is connected (this is the default behavior); \"never\" - the icon will not be present."
msgstr "ステータスを表すアイコンの表示を制御します。指定可能な値: \"always\" (常にアイコンを表示する)、\"client\" (誰かがデスクトップに接続したらアイコンを表示する; これがデフォルトの設定)、\"never\" (アイコンは表示しない)"
#: ../common/org.gnome.Vino.gschema.xml.h:31
-msgid "When true, disable the background on receive valid session"
-msgstr "妥当なセッションに入ったら背景を無効にするかどうか"
+msgid "Whether to disable the desktop background when a user is connected"
+msgstr "ユーザーが接続したら背景を無効にする"
#: ../common/org.gnome.Vino.gschema.xml.h:32
-msgid "Whether we should use UPNP to forward the port in routers"
-msgstr "UPnP を使ってポートをフォワードするかどうか"
+msgid "When true, disable the desktop background and replace it with a single block of color when a user successfully connects."
+msgstr "true にすると、ユーザーが接続に成功した時にデスクトップの背景を無効にして単一の系統の色に置き換えます。"
#: ../common/org.gnome.Vino.gschema.xml.h:33
-msgid "If true, we will use UPNP protocol to automatically forward the port used by vino in the router."
-msgstr "TRUE にすると、UPnP のプロトコルを利用して vino が使用しているルータ内のポートを自動的にフォワードします。"
+msgid "Whether a UPnP router should be used to forward and open ports"
+msgstr "UPnP ルーターを使ってポートをフォワードして開く"
#: ../common/org.gnome.Vino.gschema.xml.h:34
-msgid "Whether we should disable the XDamage extension of X.org"
-msgstr "X.org の XDamage 拡張機能を無効にするかどうか"
+msgid "If true, request that a UPnP-capable router should forward and open the port used by Vino."
+msgstr "true にすると、UPnP 対応ルーターには Vino により利用されるポートを転送して開くように要求します。"
#: ../common/org.gnome.Vino.gschema.xml.h:35
-msgid "If true, we will not use the XDamage extension of X.org. This extension does not work properly on some video drivers when using 3D effects. Disabling it will make vino work on these environments with a slower rendering as side effect."
-msgstr "TRUE にすると、X.org の XDamage 拡張機能を使用しなくなります。ビデオ・ドライバーの中には 3D 機能を使用中に、この拡張機能が正しく動作しないものがあります。これを FALSE にすると、その副作用として描画が遅くなりますが、この拡張機能が動作するようになります。"
+msgid "Whether we should disable the XDamage extension of X.org"
+msgstr "X.org の XDamage 拡張機能を無効にする"
#: ../common/org.gnome.Vino.gschema.xml.h:36
-msgid "Notify on connect"
-msgstr "接続時に通知するかどうか"
+msgid "If true, do not use the XDamage extension of X.org. This extension does not work properly on some video drivers when using 3D effects. Disabling it will make Vino work in these environments, with slower rendering as a side effect."
+msgstr "true にすると、X.org の XDamage 拡張機能を使用しなくなります。ビデオドライバーの中には 3D 機能を使用中に、この拡張機能が正しく動作しないものがあります。これを false にすると、その副作用として描画が遅くなりますが、この拡張機能が動作するようになります。"
#: ../common/org.gnome.Vino.gschema.xml.h:37
-msgid "If true, we will notify, when the user connects to the system."
-msgstr "TRUE にすると、システムにユーザーが接続した時に通知を行います。"
+msgid "Notify on connect"
+msgstr "接続時に通知する"
-#: ../capplet/vino-preferences.ui.h:1
-msgid "Desktop Sharing Preferences"
-msgstr "デスクトップ共有の設定"
-
-#: ../capplet/vino-preferences.ui.h:2
-msgid "Sharing"
-msgstr "共有"
-
-#: ../capplet/vino-preferences.ui.h:3
-msgid "Some of these preferences are locked down"
-msgstr "いくつかの設定は変更不可になっています"
-
-#: ../capplet/vino-preferences.ui.h:4
-msgid "Allow other users to _view your desktop"
-msgstr "他のユーザーが自分のデスクトップを表示できる(_V)"
-
-#: ../capplet/vino-preferences.ui.h:5
-msgid "Your desktop will be shared"
-msgstr "お使いのデスクトップを他のユーザーと共有します"
-
-#: ../capplet/vino-preferences.ui.h:6
-msgid "_Allow other users to control your desktop"
-msgstr "他のユーザーがデスクトップを操作できる(_A)"
-
-#: ../capplet/vino-preferences.ui.h:7
-msgid "Remote users are able to control your mouse and keyboard"
-msgstr "リモートのユーザーがあなたのマウスとキーボードを制御できるようになります"
-
-#: ../capplet/vino-preferences.ui.h:8
-msgid "Security"
-msgstr "セキュリティ"
-
-#: ../capplet/vino-preferences.ui.h:9
-msgid "_You must confirm each access to this machine"
-msgstr "このマシンへの接続を毎回確認する(_Y)"
-
-#: ../capplet/vino-preferences.ui.h:10
-msgid "_Require the user to enter this password:"
-msgstr "パスワードの入力を要求する(_R):"
-
-#: ../capplet/vino-preferences.ui.h:11
-msgid "Automatically _configure UPnP router to open and forward ports"
-msgstr "UPnP ルーターがポートを開放／転送するように自動的に設定する(_C)"
-
-#: ../capplet/vino-preferences.ui.h:12
-msgid "The router must have the UPnP feature enabled"
-msgstr "ルータで UPnP の機能を有効にしておいてください"
-
-#: ../capplet/vino-preferences.ui.h:13
-msgid "Show Notification Area Icon"
-msgstr "通知領域のアイコンを表示"
-
-#: ../capplet/vino-preferences.ui.h:14
-msgid "Al_ways"
-msgstr "常に行う(_W)"
-
-#: ../capplet/vino-preferences.ui.h:15
-msgid "_Only when someone is connected"
-msgstr "誰かが接続している時のみ(_O)"
-
-#: ../capplet/vino-preferences.ui.h:16
-msgid "_Never"
-msgstr "表示しない(_N)"
+#: ../common/org.gnome.Vino.gschema.xml.h:38
+msgid "If true, show a notification when a user connects to the system."
+msgstr "true にすると、システムにユーザーが接続した時に通知を行います。"
#: ../server/smclient/eggdesktopfile.c:165
#, c-format
@@ -318,7 +210,7 @@
#: ../server/smclient/eggsmclient.c:226
msgid "Disable connection to session manager"
-msgstr "セッション・マネージャーに接続しない"
+msgstr "セッションマネージャーに接続しない"
#: ../server/smclient/eggsmclient.c:229
msgid "Specify file containing saved configuration"
@@ -348,19 +240,22 @@
msgid "Your XServer does not support the XTest extension - remote desktop access will be view-only\n"
msgstr "あなたの XServer は XTest 拡張をサポートしていません - リモートデスクトップアクセスは見るだけになります\n"
-#: ../server/vino-main.c:298
+#. Tube mode uses Telepathy's Tubes to share a user's desktop directly
+#. * with another IM contact. http://telepathy.freedesktop.org/wiki/Tubes
+#.
+#: ../server/vino-main.c:301
msgid "Start in tube mode, for the ‘Share my Desktop’ feature"
msgstr "「デスクトップ共有」機能のためにチューブモードで起動します"
-#: ../server/vino-main.c:304
+#: ../server/vino-main.c:307
msgid "- VNC Server for GNOME"
msgstr "- GNOME 向けの VNC サーバー"
-#: ../server/vino-main.c:312
+#: ../server/vino-main.c:315
msgid "Run 'vino-server --help' to see a full list of available command line options"
-msgstr "'vino-server --help' を実行すると利用可能なコマンドライン・オプションの一覧が表示されます"
+msgstr "'vino-server --help' を実行すると利用可能なコマンドラインオプションの一覧が表示されます"
-#: ../server/vino-main.c:333
+#: ../server/vino-main.c:336
msgid "GNOME Desktop Sharing"
msgstr "GNOME デスクトップ共有"
@@ -381,78 +276,80 @@
#: ../server/vino-mdns.c:74
#, c-format
msgid "%s's remote desktop on %s"
-msgstr "%s@%s さんのリモート・デスクトップ"
+msgstr "%s@%s さんのリモートデスクトップ"
#: ../server/vino-prefs.c:111
#, c-format
msgid "Received signal %d, exiting."
msgstr "シグナル %d を受け取ったので終了します。"
-#: ../server/vino-prompt.c:141
+#: ../server/vino-prompt.c:144
msgid "Screen"
msgstr "スクリーン"
-#: ../server/vino-prompt.c:142
+#: ../server/vino-prompt.c:145
msgid "The screen on which to display the prompt"
msgstr "プロンプトを表示するスクリーン"
-#: ../server/vino-prompt.c:345
+#: ../server/vino-prompt.c:263 ../server/vino-status-icon.c:598
+#: ../server/vino-status-tube-icon.c:389
#, c-format
-msgid "A user on the computer '%s' is trying to remotely view or control your desktop."
-msgstr "コンピューター '%s' のユーザーがあなたのデスクトップをリモートから見る/コントロールしようとしています"
+msgid "Error initializing libnotify\n"
+msgstr "libnotify を初期化する際にエラー\n"
-#: ../server/vino-prompt.ui.h:1
-msgid "Question"
-msgstr "質問"
+#: ../server/vino-prompt.c:282
+#, c-format
+msgid "A user on the computer '%s' is trying to remotely view or control your desktop."
+msgstr "コンピューター '%s' のユーザーがあなたのデスクトップをリモートから参照または操作しようとしています"
-#: ../server/vino-prompt.ui.h:2
+#: ../server/vino-prompt.c:285
msgid "Another user is trying to view your desktop."
-msgstr "別のユーザーがお使いのデスクトップを参照しているようです"
-
-#: ../server/vino-prompt.ui.h:3
-msgid "A user on another computer is trying to remotely view or control your desktop."
-msgstr "別のコンピューターのユーザーがリモートからデスクトップを参照する、または制御しようとしています。"
+msgstr "別のユーザーがお使いのデスクトップを参照しようとしています。"
-#: ../server/vino-prompt.ui.h:4
-msgid "Do you want to allow them to do so?"
-msgstr "許可しますか?"
+#: ../server/vino-prompt.c:291
+msgid "Refuse"
+msgstr "拒否"
-#: ../server/vino-prompt.ui.h:5 ../server/vino-util.c:90
-msgid "_Refuse"
-msgstr "拒否する(_R)"
-
-#: ../server/vino-prompt.ui.h:6 ../server/vino-util.c:89
-msgid "_Allow"
-msgstr "許可する(_A)"
+#: ../server/vino-prompt.c:297
+msgid "Accept"
+msgstr "許可"
-#: ../server/vino-server.c:162 ../server/vino-server.c:185
+#: ../server/vino-server.c:166 ../server/vino-server.c:189
#, c-format
msgid "Failed to open connection to bus: %s\n"
msgstr "バスへの接続を開けませんでした: %s\n"
+#: ../server/vino-server.desktop.in.in.h:1
+msgid "Desktop Sharing"
+msgstr "デスクトップの共有"
+
#: ../server/vino-server.desktop.in.in.h:2
msgid "GNOME Desktop Sharing Server"
msgstr "GNOME デスクトップ共有サーバー"
-#: ../server/vino-status-icon.c:103 ../server/vino-status-tube-icon.c:96
+#: ../server/vino-server.desktop.in.in.h:3
+msgid "vnc;share;remote;"
+msgstr "vnc;share;remote;デスクトップ共有;リモートデスクトップ;DesktopSharing;"
+
+#: ../server/vino-status-icon.c:97 ../server/vino-status-tube-icon.c:90
msgid "Desktop sharing is enabled"
msgstr "デスクトップの共有が可能になりました"
-#: ../server/vino-status-icon.c:111
+#: ../server/vino-status-icon.c:105
#, c-format
msgid "One person is viewing your desktop"
msgid_plural "%d people are viewing your desktop"
msgstr[0] "%d 人のユーザーがあなたのデスクトップを参照しています"
-#: ../server/vino-status-icon.c:212 ../server/vino-status-tube-icon.c:180
+#: ../server/vino-status-icon.c:208 ../server/vino-status-tube-icon.c:172
msgid "Error displaying preferences"
msgstr "設定ダイアログを表示する際にエラーが発生しました"
-#: ../server/vino-status-icon.c:234 ../server/vino-status-tube-icon.c:200
+#: ../server/vino-status-icon.c:230 ../server/vino-status-tube-icon.c:192
msgid "Error displaying help"
msgstr "ヘルプを表示する際にエラーが発生しました"
-#: ../server/vino-status-icon.c:267
+#: ../server/vino-status-icon.c:263
msgid ""
"Licensed under the GNU General Public License Version 2\n"
"\n"
@@ -487,7 +384,7 @@
"まで連絡してください。\n"
#. Translators comment: put your own name here to appear in the about dialog.
-#: ../server/vino-status-icon.c:282
+#: ../server/vino-status-icon.c:278
msgid "translator-credits"
msgstr ""
"Satoru SATOH \n"
@@ -495,91 +392,87 @@
"草野 貴之 \n"
"やまねひでき \n"
"Mitsuya Shibata \n"
+"松澤 二郎 \n"
"日本GNOMEユーザー会 http://www.gnome.gr.jp/"
-#: ../server/vino-status-icon.c:288
+#: ../server/vino-status-icon.c:284
msgid "Share your desktop with other users"
msgstr "他のユーザーとデスクトップを共有します"
-#: ../server/vino-status-icon.c:355 ../server/vino-status-tube-icon.c:232
+#: ../server/vino-status-icon.c:351 ../server/vino-status-tube-icon.c:224
#, c-format
msgid "Are you sure you want to disconnect '%s'?"
msgstr "本当に '%s' との接続を閉じますか?"
-#: ../server/vino-status-icon.c:358
+#: ../server/vino-status-icon.c:354
#, c-format
msgid "The remote user from '%s' will be disconnected. Are you sure?"
-msgstr "'%s' のリモート・ユーザーに対する接続を閉じます。よろしいですか?"
+msgstr "'%s' のリモートユーザーに対する接続を閉じます。よろしいですか?"
-#: ../server/vino-status-icon.c:364
+#: ../server/vino-status-icon.c:360
msgid "Are you sure you want to disconnect all clients?"
msgstr "本当にすべてのクライアントとの接続を閉じますか?"
-#: ../server/vino-status-icon.c:366
+#: ../server/vino-status-icon.c:362
msgid "All remote users will be disconnected. Are you sure?"
-msgstr "すべてのリモート・ユーザーとの接続を閉じます。よろしいですか?"
+msgstr "すべてのリモートユーザーとの接続を閉じます。よろしいですか?"
-#: ../server/vino-status-icon.c:378 ../server/vino-status-tube-icon.c:246
+#: ../server/vino-status-icon.c:374 ../server/vino-status-tube-icon.c:238
msgid "Disconnect"
msgstr "閉じる"
-#: ../server/vino-status-icon.c:404 ../server/vino-status-tube-icon.c:271
+#: ../server/vino-status-icon.c:400 ../server/vino-status-tube-icon.c:263
msgid "_Preferences"
msgstr "設定(_P)"
-#: ../server/vino-status-icon.c:419
+#: ../server/vino-status-icon.c:415
msgid "Disconnect all"
msgstr "すべて閉じる"
#. Translators: %s is a hostname
#. Translators: %s is the alias of the telepathy contact
-#: ../server/vino-status-icon.c:443 ../server/vino-status-tube-icon.c:284
+#: ../server/vino-status-icon.c:439 ../server/vino-status-tube-icon.c:276
#, c-format
msgid "Disconnect %s"
msgstr "%s との接続を閉じる"
-#: ../server/vino-status-icon.c:464 ../server/vino-status-tube-icon.c:303
+#: ../server/vino-status-icon.c:460 ../server/vino-status-tube-icon.c:295
msgid "_Help"
msgstr "ヘルプ(_H)"
-#: ../server/vino-status-icon.c:472
+#: ../server/vino-status-icon.c:468
msgid "_About"
msgstr "このアプリケーションについて(_A)"
-#: ../server/vino-status-icon.c:605 ../server/vino-status-tube-icon.c:400
-#, c-format
-msgid "Error initializing libnotify\n"
-msgstr "libnotify を初期化する際にエラー\n"
-
#. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:626
+#: ../server/vino-status-icon.c:619
msgid "Another user is viewing your desktop"
msgstr "他のユーザーがデスクトップを参照しています"
-#: ../server/vino-status-icon.c:628
+#: ../server/vino-status-icon.c:621
#, c-format
msgid "A user on the computer '%s' is remotely viewing your desktop."
msgstr "コンピューター '%s' のユーザーがあなたのデスクトップをリモートから参照しようとしています。"
#. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:634
+#: ../server/vino-status-icon.c:627
msgid "Another user is controlling your desktop"
msgstr "他のユーザーがデスクトップを操作しています"
-#: ../server/vino-status-icon.c:636
+#: ../server/vino-status-icon.c:629
#, c-format
msgid "A user on the computer '%s' is remotely controlling your desktop."
msgstr "コンピューター '%s' のユーザーがあなたのデスクトップをリモートから操作しようとしています。"
-#: ../server/vino-status-icon.c:664 ../server/vino-status-tube-icon.c:437
+#: ../server/vino-status-icon.c:651 ../server/vino-status-tube-icon.c:423
#, c-format
msgid "Error while displaying notification bubble: %s\n"
msgstr "通知ウィンドウを表示する際にエラー: %s\n"
-#: ../server/vino-status-tube-icon.c:235
+#: ../server/vino-status-tube-icon.c:227
#, c-format
msgid "The remote user '%s' will be disconnected. Are you sure?"
-msgstr "リモート・ユーザーの '%s' に対する接続を閉じますが、よろしいですか?"
+msgstr "リモートユーザーの '%s' に対する接続を閉じますが、よろしいですか?"
#: ../server/vino-tube-server.c:220 ../server/vino-tube-server.c:249
msgid "Share my desktop information"
@@ -601,7 +494,7 @@
#: ../server/vino-tube-server.c:255
#, c-format
msgid "'%s' is remotely controlling your desktop."
-msgstr "リモート・ユーザーの '%s' はあなたのデスクトップに接続中です"
+msgstr "リモートユーザーの '%s' はあなたのデスクトップに接続中です"
#. Translators: '%s' is the name of a contact, buddy coming from Empathy
#: ../server/vino-tube-server.c:264
@@ -609,10 +502,22 @@
msgid "Waiting for '%s' to connect to the screen."
msgstr "'%s' がスクリーンに接続するまで待機します"
+#: ../server/vino-util.c:89
+msgid "_Allow"
+msgstr "許可する(_A)"
+
+#: ../server/vino-util.c:90
+msgid "_Refuse"
+msgstr "拒否する(_R)"
+
#: ../server/vino-util.c:140
msgid "An error has occurred:"
msgstr "エラーが発生しました:"
+#: ../tools/vino-passwd.c:54
+msgid "Remote desktop sharing password"
+msgstr "リモートデスクトップ共有のパスワード"
+
#: ../tools/vino-passwd.c:108
#, c-format
msgid "Cancelled"
@@ -662,7 +567,7 @@
#: ../tools/vino-passwd.c:201
msgid "Run 'vino-passwd --help' to see a full list of available command line options"
-msgstr "'vino-passwd --help' を実行すると利用可能なコマンドライン・オプションの一覧が表示されます"
+msgstr "'vino-passwd --help' を実行すると利用可能なコマンドラインオプションの一覧が表示されます"
#: ../tools/vino-passwd.c:208
#, c-format
@@ -673,3 +578,91 @@
#, c-format
msgid "ERROR: You do not have enough permissions to change Vino password.\n"
msgstr "エラー: あなたには Vino のパスワードを変更するために必要な権限がありません\n"
+
+#~ msgid "There was an error showing the URL \"%s\""
+#~ msgstr "\"%s\" という URL を表示する際にエラーが発生しました"
+
+#~ msgid ""
+#~ "There was an error displaying help:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ヘルプを表示する際にエラーが発生しました:\n"
+#~ "%s"
+
+#~ msgid "Checking the connectivity of this machine..."
+#~ msgstr "このマシンの接続情報を確認しています..."
+
+#~ msgid "Your desktop is only reachable over the local network."
+#~ msgstr "お使いのデスクトップにはローカルネットワーク内でのみ接続できます。"
+
+#~ msgid " or "
+#~ msgstr " または "
+
+#~ msgid "Others can access your computer using the address %s."
+#~ msgstr "他の人達からは %s というアドレスであなたのデスクトップにアクセスできます。"
+
+#~ msgid "Nobody can access your desktop."
+#~ msgstr "誰もあなたのデスクトップにはアクセスできません。"
+
+#~ msgid "Choose how other users can remotely view your desktop"
+#~ msgstr "リモートからデスクトップを表示する方法を選択したり設定します"
+
+#~ msgid "If true, we will use UPNP protocol to automatically forward the port used by vino in the router."
+#~ msgstr "TRUE にすると、UPnP のプロトコルを利用して vino が使用しているルータ内のポートを自動的にフォワードします。"
+
+#~ msgid "Desktop Sharing Preferences"
+#~ msgstr "デスクトップ共有の設定"
+
+#~ msgid "Sharing"
+#~ msgstr "共有"
+
+#~ msgid "Some of these preferences are locked down"
+#~ msgstr "いくつかの設定は変更不可になっています"
+
+#~ msgid "Allow other users to _view your desktop"
+#~ msgstr "他のユーザーが自分のデスクトップを表示できる(_V)"
+
+#~ msgid "Your desktop will be shared"
+#~ msgstr "お使いのデスクトップを他のユーザーと共有します"
+
+#~ msgid "_Allow other users to control your desktop"
+#~ msgstr "他のユーザーがデスクトップを操作できる(_A)"
+
+#~ msgid "Remote users are able to control your mouse and keyboard"
+#~ msgstr "リモートのユーザーがあなたのマウスとキーボードを制御できるようになります"
+
+#~ msgid "Security"
+#~ msgstr "セキュリティ"
+
+#~ msgid "_You must confirm each access to this machine"
+#~ msgstr "このマシンへの接続を毎回確認する(_Y)"
+
+#~ msgid "_Require the user to enter this password:"
+#~ msgstr "パスワードの入力を要求する(_R):"
+
+#~ msgid "Automatically _configure UPnP router to open and forward ports"
+#~ msgstr "UPnP ルーターがポートを開放／転送するように自動的に設定する(_C)"
+
+#~ msgid "The router must have the UPnP feature enabled"
+#~ msgstr "ルータで UPnP の機能を有効にしておいてください"
+
+#~ msgid "Show Notification Area Icon"
+#~ msgstr "通知領域のアイコンを表示"
+
+#~ msgid "Al_ways"
+#~ msgstr "常に行う(_W)"
+
+#~ msgid "_Only when someone is connected"
+#~ msgstr "誰かが接続している時のみ(_O)"
+
+#~ msgid "_Never"
+#~ msgstr "表示しない(_N)"
+
+#~ msgid "Question"
+#~ msgstr "質問"
+
+#~ msgid "A user on another computer is trying to remotely view or control your desktop."
+#~ msgstr "別のコンピューターのユーザーがリモートからデスクトップを参照する、または制御しようとしています。"
+
+#~ msgid "Do you want to allow them to do so?"
+#~ msgstr "許可しますか?"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/po/nb.po new/vino-3.9.92/po/nb.po
--- old/vino-3.9.3/po/nb.po 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/po/nb.po 2013-09-02 21:49:18.000000000 +0200
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: vino 3.8.x\n"
+"Project-Id-Version: vino 3.9.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 14:43+0200\n"
-"PO-Revision-Date: 2013-05-16 14:43+0200\n"
+"POT-Creation-Date: 2013-08-08 22:03+0200\n"
+"PO-Revision-Date: 2013-08-08 22:04+0200\n"
"Last-Translator: Kjartan Maraas \n"
"Language-Team: Norwegian bokmål \n"
"Language: \n"
@@ -664,79 +664,3 @@
msgid "ERROR: You do not have enough permissions to change Vino password.\n"
msgstr ""
"FEIL: Du har ikke tilstrekkelige rettigheter til å bytte passord for Vino.\n"
-
-#~ msgid "There was an error showing the URL \"%s\""
-#~ msgstr "Det oppsto en feil under visning av URL «%s»"
-
-#~ msgid ""
-#~ "There was an error displaying help:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Det oppsto en feil under visning av hjelp:\n"
-#~ "%s"
-
-#~ msgid "Checking the connectivity of this machine..."
-#~ msgstr "Sjekker konnektivitet for denne maskinen …"
-
-#~ msgid "Your desktop is only reachable over the local network."
-#~ msgstr "Skrivebordet ditt kan kun nås over det lokale nettverket."
-
-#~ msgid " or "
-#~ msgstr " eller "
-
-#~ msgid "Others can access your computer using the address %s."
-#~ msgstr "Andre kan få tilgang til din datamaskin via adressen %s."
-
-#~ msgid "Nobody can access your desktop."
-#~ msgstr "Ingen har tilgang til ditt skrivebord."
-
-#~ msgid "Choose how other users can remotely view your desktop"
-#~ msgstr "Velg hvordan andre eksterne brukere kan se ditt skrivebord"
-
-#~ msgid "Desktop Sharing Preferences"
-#~ msgstr "Brukervalg for deling av skrivebord"
-
-#~ msgid "Sharing"
-#~ msgstr "Deling"
-
-#~ msgid "Some of these preferences are locked down"
-#~ msgstr "Noen av disse brukervalgene er låst"
-
-#~ msgid "Allow other users to _view your desktop"
-#~ msgstr "La andre brukere _se ditt skrivebord"
-
-#~ msgid "Your desktop will be shared"
-#~ msgstr "Ditt skrivebord vil bli delt"
-
-#~ msgid "_Allow other users to control your desktop"
-#~ msgstr "L_a andre brukere kontrollere ditt skrivebord"
-
-#~ msgid "Remote users are able to control your mouse and keyboard"
-#~ msgstr "Eksterne brukere kan kontrollere mus og tastatur"
-
-#~ msgid "Security"
-#~ msgstr "Sikkerhet"
-
-#~ msgid "_You must confirm each access to this machine"
-#~ msgstr "D_u må bekrefte hver tilgang til denne maskinen"
-
-#~ msgid "_Require the user to enter this password:"
-#~ msgstr "K_rev at bruker oppgir dette passordet:"
-
-#~ msgid "Automatically _configure UPnP router to open and forward ports"
-#~ msgstr "_Konfigurer UPnP-ruter til å åpne og videresende porter automatisk"
-
-#~ msgid "The router must have the UPnP feature enabled"
-#~ msgstr "Ruter må ha funksjonen UPnP slått på"
-
-#~ msgid "Show Notification Area Icon"
-#~ msgstr "Vis ikon for varslingsområde"
-
-#~ msgid "Al_ways"
-#~ msgstr "All_tid"
-
-#~ msgid "_Only when someone is connected"
-#~ msgstr "Kun når n_oen er koblet til"
-
-#~ msgid "_Never"
-#~ msgstr "A_ldri"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/server/libvncserver/rfb/rfb.h new/vino-3.9.92/server/libvncserver/rfb/rfb.h
--- old/vino-3.9.3/server/libvncserver/rfb/rfb.h 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/server/libvncserver/rfb/rfb.h 2013-09-16 22:17:35.000000000 +0200
@@ -397,6 +397,7 @@
extern void rfbCloseClient(rfbClientPtr cl);
extern int ReadExact(rfbClientPtr cl, char *buf, int len);
extern int ReadExactTimeout(rfbClientPtr cl, char *buf, int len,int timeout);
+extern int ReadPending(rfbClientPtr cl);
extern int WriteExact(rfbClientPtr cl, const char *buf, int len);
extern void rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen, int insock);
extern void rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/server/libvncserver/rfbserver.c new/vino-3.9.92/server/libvncserver/rfbserver.c
--- old/vino-3.9.3/server/libvncserver/rfbserver.c 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/server/libvncserver/rfbserver.c 2013-09-16 22:15:44.000000000 +0200
@@ -387,7 +387,8 @@
rfbAuthProcessClientMessage(cl);
return;
case RFB_AUTH_DEFERRED:
- rfbLog("Authentication deferred - ignoring client message\n");
+ rfbLog("Authentication deferred for this client - closing connection\n");
+ rfbCloseClient(cl);
return;
case RFB_INITIALISATION:
rfbProcessClientInitMessage(cl);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/server/libvncserver/sockets.c new/vino-3.9.92/server/libvncserver/sockets.c
--- old/vino-3.9.3/server/libvncserver/sockets.c 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/server/libvncserver/sockets.c 2013-09-16 22:17:35.000000000 +0200
@@ -457,6 +457,21 @@
}
#ifdef VINO_HAVE_GNUTLS
+extern int ReadPending(rfbClientPtr cl)
+{
+ if (cl->useTLS && cl->tlsSession)
+ return gnutls_record_check_pending(cl->tlsSession);
+ else
+ return 0;
+}
+#else
+extern int ReadPending(rfbClientPtr cl)
+{
+ return 0;
+}
+#endif
+
+#ifdef VINO_HAVE_GNUTLS
static int
WriteExactOverTLS(rfbClientPtr cl, const char* buf, int len)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vino-3.9.3/server/vino-server.c new/vino-3.9.92/server/vino-server.c
--- old/vino-3.9.3/server/vino-server.c 2013-07-08 23:02:20.000000000 +0200
+++ new/vino-3.9.92/server/vino-server.c 2013-09-16 22:17:35.000000000 +0200
@@ -445,9 +445,12 @@
}
static inline gboolean
-more_data_pending (int fd)
+more_data_pending (rfbClientPtr rfb_client)
{
- struct pollfd pollfd = { fd, POLLIN|POLLPRI, 0 };
+ struct pollfd pollfd = { rfb_client->sock, POLLIN|POLLPRI, 0 };
+
+ if (ReadPending(rfb_client) > 0)
+ return TRUE;
return poll (&pollfd, 1, 0) == 1;
}
@@ -462,7 +465,7 @@
do {
rfbProcessClientMessage (rfb_client);
- } while (more_data_pending (rfb_client->sock));
+ } while (more_data_pending (rfb_client));
return vino_server_update_client (rfb_client);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
