diff -Nru vino-3.4.1/build-aux/config.guess vino-3.4.2/build-aux/config.guess --- vino-3.4.1/build-aux/config.guess 2012-03-26 19:50:46.000000000 +0000 +++ vino-3.4.2/build-aux/config.guess 2012-05-14 19:02:06.000000000 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-06-03' +timestamp='2012-02-10' # 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 @@ -17,9 +17,7 @@ # 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -168,7 +166,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -815,13 +813,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -830,6 +827,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -884,6 +884,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -918,13 +925,16 @@ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) echo ${UNAME_MACHINE}-pc-linux-${LIBC} @@ -958,7 +968,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) echo sparc-unknown-linux-${LIBC} @@ -993,13 +1003,13 @@ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1330,6 +1340,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru vino-3.4.1/build-aux/config.sub vino-3.4.2/build-aux/config.sub --- vino-3.4.1/build-aux/config.sub 2012-03-26 19:50:46.000000000 +0000 +++ vino-3.4.2/build-aux/config.sub 2012-05-14 19:02:06.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-06-03' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx | dvp \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -712,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -827,10 +839,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1350,7 +1370,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1562,9 +1582,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru vino-3.4.1/capplet/vino-preferences.desktop.in vino-3.4.2/capplet/vino-preferences.desktop.in --- vino-3.4.1/capplet/vino-preferences.desktop.in 2012-04-16 19:08:52.000000000 +0000 +++ vino-3.4.2/capplet/vino-preferences.desktop.in 2012-05-14 19:02:12.000000000 +0000 @@ -11,4 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vino X-GNOME-Bugzilla-Component=Preferences Dialog -X-GNOME-Bugzilla-Version=3.4.1 +X-GNOME-Bugzilla-Version=3.4.2 diff -Nru vino-3.4.1/ChangeLog vino-3.4.2/ChangeLog --- vino-3.4.1/ChangeLog 2012-04-16 19:10:54.000000000 +0000 +++ vino-3.4.2/ChangeLog 2012-05-14 19:03:43.000000000 +0000 @@ -1,3 +1,15 @@ +2012-05-14 David King + + Update NEWS for 3.4.2 release + +2012-04-22 Mitsuya Shibata + + [l10n] Update Japanese translation + +2012-04-16 David King + + Post-release version bump to 3.4.2 + 2012-04-16 David King Update NEWS for 3.4.1 release diff -Nru vino-3.4.1/configure vino-3.4.2/configure --- vino-3.4.1/configure 2012-04-16 19:08:46.000000000 +0000 +++ vino-3.4.2/configure 2012-05-14 19:02:06.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Vino 3.4.1. +# Generated by GNU Autoconf 2.68 for Vino 3.4.2. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='Vino' PACKAGE_TARNAME='vino' -PACKAGE_VERSION='3.4.1' -PACKAGE_STRING='Vino 3.4.1' +PACKAGE_VERSION='3.4.2' +PACKAGE_STRING='Vino 3.4.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vino' PACKAGE_URL='http://live.gnome.org/Vino' @@ -660,6 +660,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -1393,7 +1399,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.4.1 to adapt to many kinds of systems. +\`configure' configures Vino 3.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1467,7 +1473,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Vino 3.4.1:";; + short | recursive ) echo "Configuration of Vino 3.4.2:";; esac cat <<\_ACEOF @@ -1618,7 +1624,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Vino configure 3.4.1 +Vino configure 3.4.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1987,7 +1993,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.4.1, which was +It was created by Vino $as_me 3.4.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2807,7 +2813,7 @@ # Define the identity of the package. PACKAGE='vino' - VERSION='3.4.1' + VERSION='3.4.2' # Some tools Automake needs. @@ -13174,14 +13180,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.40.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 $as_echo_n "checking for intltool >= 0.40.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -13312,25 +13316,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -15567,7 +15594,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.4.1, which was +This file was extended by Vino $as_me 3.4.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15634,7 +15661,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.4.1 +Vino config.status 3.4.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru vino-3.4.1/configure.ac vino-3.4.2/configure.ac --- vino-3.4.1/configure.ac 2012-03-26 20:10:07.000000000 +0000 +++ vino-3.4.2/configure.ac 2012-05-14 19:01:12.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([Vino], [3.4.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [http://live.gnome.org/Vino]) +AC_INIT([Vino], [3.4.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=vino], [vino], [http://live.gnome.org/Vino]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([server/vino-fb.c]) AC_CONFIG_HEADERS([config.h]) diff -Nru vino-3.4.1/debian/changelog vino-3.4.2/debian/changelog --- vino-3.4.1/debian/changelog 2012-05-10 22:18:22.000000000 +0000 +++ vino-3.4.2/debian/changelog 2012-05-15 20:45:20.000000000 +0000 @@ -1,3 +1,17 @@ +vino (3.4.2-0ubuntu1) precise-proposed; urgency=low + + * New upstream release. + - upstream translation updates + * debian/patches/00_server_share_tube.patch + - Backport a fix from 3.5 series that fixes a regression introduced when + Vino switched to GSettings as it started exiting right away when + desktop sharing was disabled. This fixes desktop sharing from + empathy and any other telepathy clients (LP: #966556) + * debian/patches/12_app-indicators-only.patch + - refreshed + + -- Ken VanDine Tue, 15 May 2012 16:44:57 -0400 + vino (3.4.1-0ubuntu1.1) precise-proposed; urgency=low * debian/patches/12_app-indicators-only.patch diff -Nru vino-3.4.1/debian/patches/00_server_share_tube.patch vino-3.4.2/debian/patches/00_server_share_tube.patch --- vino-3.4.1/debian/patches/00_server_share_tube.patch 1970-01-01 00:00:00.000000000 +0000 +++ vino-3.4.2/debian/patches/00_server_share_tube.patch 2012-05-15 20:17:30.000000000 +0000 @@ -0,0 +1,433 @@ +=== modified file 'server/org.freedesktop.Telepathy.Client.Vino.service.in' +--- old/server/org.freedesktop.Telepathy.Client.Vino.service.in 2011-05-23 13:09:43 +0000 ++++ new/server/org.freedesktop.Telepathy.Client.Vino.service.in 2012-05-15 20:17:03 +0000 +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.freedesktop.Telepathy.Client.Vino +-Exec=@libexecdir@/vino-server ++Exec=@libexecdir@/vino-server --tube + +=== modified file 'server/vino-dbus-listener.c' +--- old/server/vino-dbus-listener.c 2011-11-22 11:30:37 +0000 ++++ new/server/vino-dbus-listener.c 2012-05-15 20:17:03 +0000 +@@ -26,6 +26,7 @@ + + #ifdef VINO_HAVE_TELEPATHY_GLIB + #include "vino-tube-servers-manager.h" ++#include "vino-tube-server.h" + #endif + + #include "vino-util.h" +@@ -35,6 +36,16 @@ + + #include "vino-mdns.h" + ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++enum ++{ ++ SIG_TUBE_DISCONNECTED, ++ LAST_SIGNAL ++}; ++ ++static guint signals[LAST_SIGNAL]; ++#endif ++ + struct _VinoDBusListener + { + GObject parent_instance; +@@ -79,11 +90,24 @@ + ->finalize (object); + } + ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++static void ++tube_disconnected_cb (VinoTubeServersManager *mgr, ++ VinoTubeServer *server, ++ VinoDBusListener *listener) ++{ ++ g_signal_emit (listener, signals[SIG_TUBE_DISCONNECTED], 0, server); ++} ++#endif ++ + static void + vino_dbus_listener_init (VinoDBusListener *listener) + { + #ifdef VINO_HAVE_TELEPATHY_GLIB + listener->manager = vino_tube_servers_manager_new (); ++ ++ g_signal_connect (listener->manager, "tube-disconnected", ++ G_CALLBACK (tube_disconnected_cb), listener); + #endif + } + +@@ -91,6 +115,15 @@ + vino_dbus_listener_class_init (GObjectClass *class) + { + class->finalize = vino_dbus_listener_finalize; ++ ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++ signals[SIG_TUBE_DISCONNECTED] = g_signal_new ("tube-disconnected", ++ G_OBJECT_CLASS_TYPE (class), ++ G_SIGNAL_RUN_LAST, ++ 0, NULL, NULL, NULL, ++ G_TYPE_NONE, ++ 1, VINO_TYPE_TUBE_SERVER); ++#endif + } + + static guint16 +@@ -219,3 +252,9 @@ + + return listener; + } ++ ++VinoServer * ++vino_dbus_listener_get_server (VinoDBusListener *self) ++{ ++ return self->server; ++} + +=== modified file 'server/vino-dbus-listener.h' +--- old/server/vino-dbus-listener.h 2011-04-20 17:52:35 +0000 ++++ new/server/vino-dbus-listener.h 2012-05-15 20:17:03 +0000 +@@ -36,6 +36,7 @@ + VinoDBusListener * vino_dbus_listener_new (gint screen); + void vino_dbus_listener_set_server (VinoDBusListener *listener, + VinoServer *server); ++VinoServer * vino_dbus_listener_get_server (VinoDBusListener *self); + + gboolean vino_dbus_request_name (void); + + +=== modified file 'server/vino-main.c' +--- old/server/vino-main.c 2012-05-15 20:01:50 +0000 ++++ new/server/vino-main.c 2012-05-15 20:17:03 +0000 +@@ -39,6 +39,10 @@ + #ifdef VINO_HAVE_GNUTLS + #include + ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++static gboolean tube = FALSE; ++#endif ++ + # ifdef GNOME_ENABLE_DEBUG + static void + vino_debug_gnutls (int level, +@@ -59,15 +63,91 @@ + GMainLoop *main_loop; + } VinoApplication; + ++typedef enum ++{ ++ /* Screen sharing enabled, Vino should always be running */ ++ RUN_MODE_ALL, ++ /* Screen sharing disabled but Vino started with --tube; ++ * should exit once the tube has been handled */ ++ RUN_MODE_TUBE, ++ /* Screen sharing disabled and Vino started without --tube; ++ * should exit right away */ ++ RUN_MODE_EXIT, ++} RunMode; ++ ++static RunMode ++get_run_mode (VinoApplication *vino) ++{ ++ if (g_settings_get_boolean (vino->settings, "enabled")) ++ return RUN_MODE_ALL; ++ ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++ if (tube) ++ return RUN_MODE_TUBE; ++#endif ++ ++ return RUN_MODE_EXIT; ++} ++ ++static void ++set_all_servers_reject(VinoApplication *vino, ++ gboolean reject) ++{ ++ guint i; ++ ++ for (i = 0; i < vino->n_screens; i++) ++ { ++ VinoServer *server; ++ ++ server = vino_dbus_listener_get_server (vino->listeners[i]); ++ ++ vino_server_set_reject_incoming (server, reject); ++ } ++} ++ + static void + enabled_changed (VinoApplication *vino) + { +- if (!g_settings_get_boolean (vino->settings, "enabled")) ++ RunMode mode; ++ gboolean reject; ++ ++ mode = get_run_mode (vino); ++ if (mode == RUN_MODE_EXIT) + { + g_message ("The desktop sharing service has been disabled, exiting."); + g_main_loop_quit (vino->main_loop); +- } +-} ++ return; ++ } ++ ++ if (mode == RUN_MODE_TUBE) ++ { ++ g_message ("The desktop sharing service has been disabled, " ++ "reject network connections"); ++ reject = TRUE; ++ } ++ else ++ { ++ g_message ("The desktop sharing service has been enabled, " ++ "accept network connections"); ++ reject = FALSE; ++ } ++ ++ set_all_servers_reject (vino, reject); ++} ++ ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++static void ++tube_disconnected_cb (VinoDBusListener *listener, ++ VinoTubeServer *server, ++ VinoApplication *vino) ++{ ++ if (get_run_mode (vino) != RUN_MODE_TUBE) ++ return; ++ ++ g_message ("Tube has been closed, exiting."); ++ g_main_loop_quit (vino->main_loop); ++} ++#endif + + static void + bus_acquired (GDBusConnection *connection, +@@ -89,7 +169,14 @@ + vino->n_screens = gdk_display_get_n_screens (vino->display); + vino->listeners = g_new (VinoDBusListener *, vino->n_screens); + for (i = 0; i < vino->n_screens; i++) +- vino->listeners[i] = vino_dbus_listener_new (i); ++ { ++ vino->listeners[i] = vino_dbus_listener_new (i); ++ ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++ g_signal_connect (vino->listeners[i], "tube-disconnected", ++ G_CALLBACK (tube_disconnected_cb), vino); ++#endif ++ } + } + + static void +@@ -100,6 +187,13 @@ + VinoApplication *vino = user_data; + gboolean view_only; + gint i; ++ gboolean reject = FALSE; ++ ++ if (get_run_mode (vino) == RUN_MODE_TUBE) ++ { ++ g_message ("Started in tube mode; reject network connections"); ++ reject = TRUE; ++ } + + /* Name is acquired. Start up the servers and register them with the + * listeners. +@@ -155,6 +249,7 @@ + + vino_dbus_listener_set_server (vino->listeners[i], server); + vino_server_set_on_hold (server, FALSE); ++ vino_server_set_reject_incoming (server, reject); + + if (g_settings_get_boolean (vino->settings, "enabled")) + { +@@ -196,10 +291,21 @@ + { + GOptionContext *context; + GError *error = NULL; ++ GOptionEntry options[] = { ++#ifdef VINO_HAVE_TELEPATHY_GLIB ++ { "tube", 't', ++ 0, G_OPTION_ARG_NONE, &tube, ++ N_("Start in tube mode, for the ‘Share my Desktop’ feature"), ++ NULL }, ++#endif ++ { NULL } ++ }; + + context = g_option_context_new (_("- VNC Server for GNOME")); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_add_group (context, egg_sm_client_get_option_group ()); ++ g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); ++ + if (!g_option_context_parse (context, &argc, &argv, &error)) + { + g_print ("%s\n%s\n", error->message, +@@ -215,7 +321,8 @@ + vino.settings = g_settings_new ("org.gnome.Vino"); + g_signal_connect_swapped (vino.settings, "changed::enabled", + G_CALLBACK (enabled_changed), &vino); +- if (!g_settings_get_boolean (vino.settings, "enabled")) ++ ++ if (get_run_mode (&vino) == RUN_MODE_EXIT) + { + g_warning ("The desktop sharing service is not " + "enabled, so it should not be run."); + +=== modified file 'server/vino-server.c' +--- old/server/vino-server.c 2012-05-15 20:01:50 +0000 ++++ new/server/vino-server.c 2012-05-15 20:17:03 +0000 +@@ -88,6 +88,7 @@ + guint use_upnp : 1; + guint disable_xdamage : 1; + guint notify_on_connect : 1; ++ guint reject_incoming : 1; + }; + + struct _VinoClient +@@ -123,7 +124,8 @@ + PROP_DISABLE_BACKGROUND, + PROP_USE_UPNP, + PROP_DISABLE_XDAMAGE, +- PROP_NOTIFY_ON_CONNECT ++ PROP_NOTIFY_ON_CONNECT, ++ PROP_REJECT_INCOMING + }; + + static enum rfbNewClientAction vino_server_auth_client (VinoServer *server, +@@ -502,6 +504,12 @@ + + g_return_val_if_fail (VINO_IS_SERVER (server), RFB_CLIENT_REFUSE); + ++ if (server->priv->reject_incoming) ++ { ++ dprintf (RFB, "Reject client on fd %d\n", rfb_client->sock); ++ return RFB_CLIENT_REFUSE; ++ } ++ + dprintf (RFB, "New client on fd %d\n", rfb_client->sock); + + if (!server->priv->fb) +@@ -1196,6 +1204,9 @@ + case PROP_DISABLE_XDAMAGE: + vino_server_set_disable_xdamage (server, g_value_get_boolean (value)); + break; ++ case PROP_REJECT_INCOMING: ++ vino_server_set_reject_incoming (server, g_value_get_boolean (value)); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -1263,6 +1274,9 @@ + case PROP_NOTIFY_ON_CONNECT: + g_value_set_boolean (value, server->priv->notify_on_connect); + break; ++ case PROP_REJECT_INCOMING: ++ g_value_set_boolean (value, server->priv->reject_incoming); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -1505,7 +1519,15 @@ + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); +- ++ g_object_class_install_property (gobject_class, ++ PROP_REJECT_INCOMING, ++ g_param_spec_boolean ("reject-incoming", ++ "Reject incoming", ++ "If TRUE reject incoming connections", ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_STATIC_STRINGS)); + } + + VinoServer * +@@ -1918,3 +1940,23 @@ + return server->priv->icon; + } + ++void ++vino_server_set_reject_incoming (VinoServer *server, ++ gboolean reject) ++{ ++ g_return_if_fail (VINO_IS_SERVER (server)); ++ ++ if (server->priv->reject_incoming == reject) ++ return; ++ ++ server->priv->reject_incoming = reject; ++ g_object_notify (G_OBJECT (server), "reject-incoming"); ++} ++ ++gboolean ++vino_server_get_reject_incoming (VinoServer *server) ++{ ++ g_return_val_if_fail (VINO_IS_SERVER (server), FALSE); ++ ++ return server->priv->reject_incoming; ++} + +=== modified file 'server/vino-server.h' +--- old/server/vino-server.h 2012-05-15 20:01:50 +0000 ++++ new/server/vino-server.h 2012-05-15 20:17:03 +0000 +@@ -120,6 +120,9 @@ + void vino_server_set_disable_xdamage (VinoServer *server, + gboolean disable_xdamage); + gboolean vino_server_get_disable_xdamage (VinoServer *server); ++void vino_server_set_reject_incoming (VinoServer *server, ++ gboolean reject); ++gboolean vino_server_get_reject_incoming (VinoServer *server); + + #include "vino-status-icon.h" + VinoStatusIcon *vino_server_get_status_icon (VinoServer *server); + +=== modified file 'server/vino-tube-servers-manager.c' +--- old/server/vino-tube-servers-manager.c 2012-05-10 15:18:13 +0000 ++++ new/server/vino-tube-servers-manager.c 2012-05-15 20:17:03 +0000 +@@ -40,6 +40,14 @@ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), VINO_TYPE_TUBE_SERVERS_MANAGER,\ + VinoTubeServersManagerPrivate)) + ++enum ++{ ++ SIG_TUBE_DISCONNECTED, ++ LAST_SIGNAL ++}; ++ ++static guint signals[LAST_SIGNAL]; ++ + static void handle_channels_cb (TpSimpleHandler *handler, + TpAccount *account, + TpConnection *connection, +@@ -84,6 +92,13 @@ + + gobject_class->dispose = vino_tube_servers_manager_dispose; + ++ signals[SIG_TUBE_DISCONNECTED] = g_signal_new ("tube-disconnected", ++ G_OBJECT_CLASS_TYPE (klass), ++ G_SIGNAL_RUN_LAST, ++ 0, NULL, NULL, NULL, ++ G_TYPE_NONE, ++ 1, VINO_TYPE_TUBE_SERVER); ++ + g_type_class_add_private (klass, sizeof (VinoTubeServersManagerPrivate)); + } + +@@ -129,6 +144,8 @@ + VinoTubeServersManager *self = VINO_TUBE_SERVERS_MANAGER (object); + self->priv->vino_tube_servers = g_slist_remove + (self->priv->vino_tube_servers, server); ++ ++ g_signal_emit (self, signals[SIG_TUBE_DISCONNECTED], 0, server); + g_object_unref (server); + } + + diff -Nru vino-3.4.1/debian/patches/12_app-indicators-only.patch vino-3.4.2/debian/patches/12_app-indicators-only.patch --- vino-3.4.1/debian/patches/12_app-indicators-only.patch 2012-05-10 21:55:23.000000000 +0000 +++ vino-3.4.2/debian/patches/12_app-indicators-only.patch 2012-05-15 20:24:35.000000000 +0000 @@ -15,10 +15,10 @@ server/vino-tube-servers-manager.c | 3 14 files changed, 1460 insertions(+), 1 deletion(-) -Index: vino-3.4.1/server/vino-tube-server.h +Index: vino-3.4.2/server/vino-tube-server.h =================================================================== ---- vino-3.4.1.orig/server/vino-tube-server.h 2011-02-23 12:29:05.000000000 -0800 -+++ vino-3.4.1/server/vino-tube-server.h 2012-05-10 14:37:10.593194093 -0700 +--- vino-3.4.2.orig/server/vino-tube-server.h 2012-05-15 16:00:58.681300000 -0400 ++++ vino-3.4.2/server/vino-tube-server.h 2012-05-15 16:23:03.757343697 -0400 @@ -27,6 +27,10 @@ #include "vino-types.h" @@ -30,10 +30,10 @@ #include "vino-status-tube-icon.h" G_BEGIN_DECLS -Index: vino-3.4.1/server/vino-app-indicator.c +Index: vino-3.4.2/server/vino-app-indicator.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vino-3.4.1/server/vino-app-indicator.c 2012-05-10 14:37:10.593194093 -0700 ++++ vino-3.4.2/server/vino-app-indicator.c 2012-05-15 16:23:03.757343697 -0400 @@ -0,0 +1,712 @@ +/* + * Copyright (C) 2010 Canonical Ltd @@ -747,10 +747,10 @@ + + return indicator->priv->visibility; +} -Index: vino-3.4.1/server/vino-app-indicator.h +Index: vino-3.4.2/server/vino-app-indicator.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vino-3.4.1/server/vino-app-indicator.h 2012-05-10 14:37:10.593194093 -0700 ++++ vino-3.4.2/server/vino-app-indicator.h 2012-05-15 16:23:03.757343697 -0400 @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2010 Canonical Ltd @@ -827,10 +827,10 @@ +G_END_DECLS + +#endif /* __VINO_APP_INDICATOR_H__ */ -Index: vino-3.4.1/server/vino-prefs.c +Index: vino-3.4.2/server/vino-prefs.c =================================================================== ---- vino-3.4.1.orig/server/vino-prefs.c 2012-03-19 13:17:39.000000000 -0700 -+++ vino-3.4.1/server/vino-prefs.c 2012-05-10 14:37:10.593194093 -0700 +--- vino-3.4.2.orig/server/vino-prefs.c 2012-05-15 16:00:58.693300000 -0400 ++++ vino-3.4.2/server/vino-prefs.c 2012-05-15 16:23:03.757343697 -0400 @@ -34,6 +34,9 @@ #include "vino-prefs.h" #include "vino-util.h" @@ -879,10 +879,10 @@ vino_server_set_on_hold (server, FALSE); -Index: vino-3.4.1/server/vino-server.c +Index: vino-3.4.2/server/vino-server.c =================================================================== ---- vino-3.4.1.orig/server/vino-server.c 2012-03-19 13:17:39.000000000 -0700 -+++ vino-3.4.1/server/vino-server.c 2012-05-10 14:37:10.593194093 -0700 +--- vino-3.4.2.orig/server/vino-server.c 2012-05-15 16:23:03.713343695 -0400 ++++ vino-3.4.2/server/vino-server.c 2012-05-15 16:23:03.757343697 -0400 @@ -58,6 +58,9 @@ VinoFB *fb; VinoCursorData *cursor_data; @@ -893,7 +893,7 @@ VinoStatusIcon *icon; gboolean display_status_icon; VinoUpnp *upnp; -@@ -302,7 +305,11 @@ +@@ -304,7 +307,11 @@ VinoClient *client) { if (server->priv->display_status_icon) @@ -905,7 +905,7 @@ vino_server_unlock_screen (); -@@ -317,7 +324,11 @@ +@@ -319,7 +326,11 @@ { if (server->priv->display_status_icon) { @@ -917,7 +917,7 @@ { vino_server_lock_screen (server); -@@ -1126,9 +1137,15 @@ +@@ -1134,9 +1145,15 @@ g_object_unref (server->priv->fb); server->priv->fb = NULL; @@ -933,9 +933,9 @@ if (server->priv->upnp) g_object_unref (server->priv->upnp); -@@ -1196,6 +1213,10 @@ - case PROP_DISABLE_XDAMAGE: - vino_server_set_disable_xdamage (server, g_value_get_boolean (value)); +@@ -1207,6 +1224,10 @@ + case PROP_REJECT_INCOMING: + vino_server_set_reject_incoming (server, g_value_get_boolean (value)); break; + case PROP_NOTIFY_ON_CONNECT: + server->priv->notify_on_connect = g_value_get_boolean (value); @@ -944,7 +944,7 @@ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -1275,9 +1296,15 @@ +@@ -1289,9 +1310,15 @@ VinoServer *server = VINO_SERVER (object); if (server->priv->display_status_icon) @@ -960,7 +960,7 @@ } -@@ -1695,8 +1722,13 @@ +@@ -1717,8 +1744,13 @@ g_object_notify (G_OBJECT (server), "on-hold"); @@ -974,7 +974,7 @@ vino_server_control_upnp (server); } -@@ -1910,6 +1942,16 @@ +@@ -1932,6 +1964,16 @@ return server->priv->notify_on_connect; } @@ -991,11 +991,11 @@ VinoStatusIcon * vino_server_get_status_icon (VinoServer *server) { -Index: vino-3.4.1/server/vino-server.h +Index: vino-3.4.2/server/vino-server.h =================================================================== ---- vino-3.4.1.orig/server/vino-server.h 2011-06-16 05:55:57.000000000 -0700 -+++ vino-3.4.1/server/vino-server.h 2012-05-10 14:37:10.593194093 -0700 -@@ -124,6 +124,11 @@ +--- vino-3.4.2.orig/server/vino-server.h 2012-05-15 16:23:03.713343695 -0400 ++++ vino-3.4.2/server/vino-server.h 2012-05-15 16:23:03.757343697 -0400 +@@ -127,6 +127,11 @@ #include "vino-status-icon.h" VinoStatusIcon *vino_server_get_status_icon (VinoServer *server); @@ -1007,10 +1007,10 @@ const char *vino_client_get_hostname (VinoClient *client); void vino_client_disconnect (VinoClient *client); -Index: vino-3.4.1/server/vino-tube-app-indicator.c +Index: vino-3.4.2/server/vino-tube-app-indicator.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vino-3.4.1/server/vino-tube-app-indicator.c 2012-05-10 14:37:10.593194093 -0700 ++++ vino-3.4.2/server/vino-tube-app-indicator.c 2012-05-15 16:23:03.757343697 -0400 @@ -0,0 +1,464 @@ +/* + * © 2010, Canonical Ltd @@ -1476,10 +1476,10 @@ +#endif /* VINO_ENABLE_LIBNOTIFY */ +} + -Index: vino-3.4.1/server/vino-tube-app-indicator.h +Index: vino-3.4.2/server/vino-tube-app-indicator.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vino-3.4.1/server/vino-tube-app-indicator.h 2012-05-10 14:37:10.593194093 -0700 ++++ vino-3.4.2/server/vino-tube-app-indicator.h 2012-05-15 16:23:03.757343697 -0400 @@ -0,0 +1,72 @@ +/* + * © 2010, Canonical Ltd @@ -1553,10 +1553,10 @@ +G_END_DECLS + +#endif /* __VINO_TUBE_APP_INDICATOR_H__ */ -Index: vino-3.4.1/server/vino-tube-server.c +Index: vino-3.4.2/server/vino-tube-server.c =================================================================== ---- vino-3.4.1.orig/server/vino-tube-server.c 2011-05-07 03:57:29.000000000 -0700 -+++ vino-3.4.1/server/vino-tube-server.c 2012-05-10 14:37:10.597194133 -0700 +--- vino-3.4.2.orig/server/vino-tube-server.c 2012-05-15 16:00:58.641300000 -0400 ++++ vino-3.4.2/server/vino-tube-server.c 2012-05-15 16:23:03.761343697 -0400 @@ -30,7 +30,6 @@ #include #include @@ -1669,10 +1669,10 @@ VINO_STATUS_TUBE_ICON_VISIBILITY_ALWAYS); tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed -Index: vino-3.4.1/configure.ac +Index: vino-3.4.2/configure.ac =================================================================== ---- vino-3.4.1.orig/configure.ac 2012-05-10 14:37:10.557193915 -0700 -+++ vino-3.4.1/configure.ac 2012-05-10 14:37:10.597194133 -0700 +--- vino-3.4.2.orig/configure.ac 2012-05-15 16:23:03.729343695 -0400 ++++ vino-3.4.2/configure.ac 2012-05-15 16:23:03.761343697 -0400 @@ -97,6 +97,23 @@ AS_IF([test "x$have_libnotify" = "xyes"], [AC_MSG_ERROR([libnotify support requested but not found])])]) @@ -1697,10 +1697,10 @@ # Check for NetworkManager NETWORKMANAGER_DEPS="NetworkManager >= 0.7" -Index: vino-3.4.1/Makefile.am +Index: vino-3.4.2/Makefile.am =================================================================== ---- vino-3.4.1.orig/Makefile.am 2012-05-10 14:37:10.553193905 -0700 -+++ vino-3.4.1/Makefile.am 2012-05-10 14:37:10.597194133 -0700 +--- vino-3.4.2.orig/Makefile.am 2012-05-15 16:23:03.729343695 -0400 ++++ vino-3.4.2/Makefile.am 2012-05-15 16:23:03.761343697 -0400 @@ -158,6 +158,16 @@ $(VINO_HTTP_sources) \ $(VINO_TELEPATHY_GLIB_sources) @@ -1718,11 +1718,11 @@ marshal_data = \ server/vino-marshal.c \ server/vino-marshal.h -Index: vino-3.4.1/server/vino-main.c +Index: vino-3.4.2/server/vino-main.c =================================================================== ---- vino-3.4.1.orig/server/vino-main.c 2011-06-13 08:14:28.000000000 -0700 -+++ vino-3.4.1/server/vino-main.c 2012-05-10 14:37:10.597194133 -0700 -@@ -150,7 +150,11 @@ +--- vino-3.4.2.orig/server/vino-main.c 2012-05-15 16:23:03.709343695 -0400 ++++ vino-3.4.2/server/vino-main.c 2012-05-15 16:23:03.761343697 -0400 +@@ -244,7 +244,11 @@ g_settings_bind (vino->settings, "disable-xdamage", server, "disable-xdamage", G_SETTINGS_BIND_GET); g_settings_bind (vino->settings, "icon-visibility", @@ -1734,10 +1734,10 @@ "visibility", G_SETTINGS_BIND_GET); vino_dbus_listener_set_server (vino->listeners[i], server); -Index: vino-3.4.1/po/POTFILES.in +Index: vino-3.4.2/po/POTFILES.in =================================================================== ---- vino-3.4.1.orig/po/POTFILES.in 2011-05-07 03:57:28.000000000 -0700 -+++ vino-3.4.1/po/POTFILES.in 2012-05-10 14:37:10.597194133 -0700 +--- vino-3.4.2.orig/po/POTFILES.in 2012-05-15 16:00:58.717300000 -0400 ++++ vino-3.4.2/po/POTFILES.in 2012-05-15 16:23:03.761343697 -0400 @@ -16,6 +16,8 @@ server/vino-server.c server/vino-server.desktop.in.in diff -Nru vino-3.4.1/debian/patches/series vino-3.4.2/debian/patches/series --- vino-3.4.1/debian/patches/series 2012-05-10 21:54:28.000000000 +0000 +++ vino-3.4.2/debian/patches/series 2012-05-15 20:20:02.000000000 +0000 @@ -1,3 +1,4 @@ +00_server_share_tube.patch 02_server_sm-disable.patch 05_use-system-miniupnpc.patch 06_use-ubuntu-help.patch diff -Nru vino-3.4.1/m4/intltool.m4 vino-3.4.2/m4/intltool.m4 --- vino-3.4.1/m4/intltool.m4 2012-03-26 19:50:41.000000000 +0000 +++ vino-3.4.2/m4/intltool.m4 2012-05-14 19:02:03.000000000 +0000 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -36,13 +36,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -55,25 +53,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) diff -Nru vino-3.4.1/Makefile.in vino-3.4.2/Makefile.in --- vino-3.4.1/Makefile.in 2012-04-16 19:08:47.000000000 +0000 +++ vino-3.4.2/Makefile.in 2012-05-14 19:02:07.000000000 +0000 @@ -347,6 +347,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JPEG_LIBS = @JPEG_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -440,6 +444,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru vino-3.4.1/NEWS vino-3.4.2/NEWS --- vino-3.4.1/NEWS 2012-04-16 19:08:25.000000000 +0000 +++ vino-3.4.2/NEWS 2012-05-14 19:03:18.000000000 +0000 @@ -1,3 +1,13 @@ +Vino 3.4.2 +========== + +David King (2): + Update NEWS for 3.4.2 release + Post-release version bump to 3.4.2 + +Mitsuya Shibata (1): + [l10n] Update Japanese translation + Vino 3.4.1 ========== diff -Nru vino-3.4.1/po/ja.po vino-3.4.2/po/ja.po --- vino-3.4.1/po/ja.po 2012-03-19 20:17:39.000000000 +0000 +++ vino-3.4.2/po/ja.po 2012-04-24 19:00:47.000000000 +0000 @@ -1,5 +1,5 @@ # Japanese messsage catalogue for vino -# Copyright (C) 2004-2011 THE vino'S COPYRIGHT HOLDER +# Copyright (C) 2004-2012 THE vino'S COPYRIGHT HOLDER # This file is distributed under the same license as the vino package. # Satoru SATOH , 2004-2006. # Takeshi AIHANA , 2006-2009. @@ -12,9 +12,9 @@ "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: 2011-10-24 16:04+0000\n" -"PO-Revision-Date: 2011-10-30 07:05+0900\n" -"Last-Translator: Hideki Yamane \n" +"POT-Creation-Date: 2012-04-16 19:14+0000\n" +"PO-Revision-Date: 2012-04-21 19:21+0900\n" +"Last-Translator: Mitsuya Shibata \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,42 +58,19 @@ msgstr "誰もあなたのデスクトップにはアクセスできません。" #: ../capplet/vino-preferences.desktop.in.in.h:1 -msgid "Choose how other users can remotely view your desktop" -msgstr "リモートからデスクトップを表示する方法を選択したり設定します" - -#: ../capplet/vino-preferences.desktop.in.in.h:2 #: ../server/vino-server.desktop.in.in.h:1 msgid "Desktop Sharing" msgstr "デスクトップの共有" -#: ../common/org.gnome.Vino.gschema.xml.in.h:1 -msgid "Allowed authentication methods" -msgstr "許可された認証方法" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:2 -msgid "Alternative port number" -msgstr "別のポート番号" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:3 -msgid "E-mail address to which the remote desktop URL should be sent" -msgstr "リモート・デスクトップ URL の送信先メールアドレス" +#: ../capplet/vino-preferences.desktop.in.in.h:2 +msgid "Choose how other users can remotely view your desktop" +msgstr "リモートからデスクトップを表示する方法を選択したり設定します" -#: ../common/org.gnome.Vino.gschema.xml.in.h:4 +#: ../common/org.gnome.Vino.gschema.xml.in.h:1 msgid "Enable remote access to the desktop" msgstr "デスクトップへのリモートアクセスを有効にする" -#: ../common/org.gnome.Vino.gschema.xml.in.h:5 -msgid "" -"If not set, the server will listen on all network interfaces. Set this if " -"you want that accept connections only from some specific network interface. " -"eg: eth0, wifi0, lo, ..." -msgstr "" -"特に指定しない場合、リモート・デスクトップのサーバーはすべてのネットワーク・" -"インターフェースを監視します。もし特定のネットワーク・インターフェースからの" -"み接続を許可したいような場合は、ここにそのネットワークインターフェースを指定" -"してください (例: eth0、wifi0、lo 等)。" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:6 +#: ../common/org.gnome.Vino.gschema.xml.in.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." @@ -102,7 +79,11 @@ "ます。リモート・マシンのユーザーは VNC ビューワーを使ってデスクトップに接続で" "きます。" -#: ../common/org.gnome.Vino.gschema.xml.in.h:7 +#: ../common/org.gnome.Vino.gschema.xml.in.h:3 +msgid "Prompt the user before completing a connection" +msgstr "接続する前にパスワード入力を求めるかどうか" + +#: ../common/org.gnome.Vino.gschema.xml.in.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 " @@ -112,7 +93,11 @@ "るまでデスクトップに接続することはできません。特にアクセスがパスワードで保護" "されていない場合に推奨します。" -#: ../common/org.gnome.Vino.gschema.xml.in.h:8 +#: ../common/org.gnome.Vino.gschema.xml.in.h:5 +msgid "Only allow remote users to view the desktop" +msgstr "デスクトップの表示のみ許可するかどうか" + +#: ../common/org.gnome.Vino.gschema.xml.in.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." @@ -120,24 +105,26 @@ "TRUE にすると、リモート・ユーザーはデスクトップを参照することしかできなくなり" "ます。リモート・ユーザーはマウスやキーボードを利用することはできません。" -#: ../common/org.gnome.Vino.gschema.xml.in.h:9 +#: ../common/org.gnome.Vino.gschema.xml.in.h:7 +msgid "Network interface for listening" +msgstr "監視するネットワークのインターフェース" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:8 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." +"If not set, the server will listen on all network interfaces. Set this if " +"you want that accept connections only from some specific network interface. " +"eg: eth0, wifi0, lo, ..." msgstr "" -"TRUE にすると、リモート・ユーザーがデスクトップにアクセスするには暗号化がサ" -"ポートされている必要があります。このようなアクセスを取りなすネットワークが信" -"頼できるものでない限り、暗号化をサポートしているクライアントの使用を強く推奨" -"します。" +"特に指定しない場合、リモート・デスクトップのサーバーはすべてのネットワーク・" +"インターフェースを監視します。もし特定のネットワーク・インターフェースからの" +"み接続を許可したいような場合は、ここにそのネットワークインターフェースを指定" +"してください (例: eth0、wifi0、lo 等)。" -#: ../common/org.gnome.Vino.gschema.xml.in.h:10 -msgid "If true, screen will be locked after the last remote client disconnect." -msgstr "" -"TRUE にすると、最後のリモート・クライアントからの接続が切れた時に画面をロック" -"します。" +#: ../common/org.gnome.Vino.gschema.xml.in.h:9 +msgid "Listen on an alternative port" +msgstr "別のポートを監視するかどうか" -#: ../common/org.gnome.Vino.gschema.xml.in.h:11 +#: ../common/org.gnome.Vino.gschema.xml.in.h:10 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." @@ -145,31 +132,38 @@ "true にすると、サーバーはデフォルトのポート (5900番) ではなく、別のポートを監" "視します。このポートは 'alternative-port' キーで指定してください。" +#: ../common/org.gnome.Vino.gschema.xml.in.h:11 +msgid "Alternative port number" +msgstr "別のポート番号" + #: ../common/org.gnome.Vino.gschema.xml.in.h:12 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." +"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 "" -"TRUE にすると、X.org の XDamage 拡張機能を使用しなくなります。ビデオ・ドライ" -"バーの中には 3D 機能を使用中に、この拡張機能が正しく動作しないものがありま" -"す。これを FALSE にすると、その副作用として描画が遅くなりますが、この拡張機能" -"が動作するようになります。" +"'use-alternative-port' キーが TRUE の場合に、サーバーが監視するポート番号 " +"(5000〜50000) です。" #: ../common/org.gnome.Vino.gschema.xml.in.h:13 -msgid "" -"If true, we will use UPNP protocol to automatically forward the port used by " -"vino in the router." -msgstr "" -"TRUE にすると、UPnP のプロトコルを利用して vino が使用しているルータ内のポー" -"トを自動的にフォワードします。" +msgid "Require encryption" +msgstr "暗号化するかどうか" #: ../common/org.gnome.Vino.gschema.xml.in.h:14 -msgid "Listen on an alternative port" -msgstr "別のポートを監視するかどうか" +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 にすると、リモート・ユーザーがデスクトップにアクセスするには暗号化がサ" +"ポートされている必要があります。このようなアクセスを取りなすネットワークが信" +"頼できるものでない限り、暗号化をサポートしているクライアントの使用を強く推奨" +"します。" #: ../common/org.gnome.Vino.gschema.xml.in.h:15 +msgid "Allowed authentication methods" +msgstr "許可された認証方法" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:16 msgid "" "Lists the authentication methods with which remote users may access the " "desktop. There are two possible authentication methods; \"vnc\" causes the " @@ -181,31 +175,11 @@ "可能な値: \"vnc\" (接続する前に vnc-password キーで指定したパスワードの入力を" "リモートのユーザーに要求する)、\"none\" (誰でも認証なしで接続できる)" -#: ../common/org.gnome.Vino.gschema.xml.in.h:16 -msgid "Lock the screen when last user disconnect" -msgstr "接続が切れたら画面をロックするかどうか" - #: ../common/org.gnome.Vino.gschema.xml.in.h:17 -msgid "Network interface for listening" -msgstr "監視するネットワークのインターフェース" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:18 -msgid "Only allow remote users to view the desktop" -msgstr "デスクトップの表示のみ許可するかどうか" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:19 msgid "Password required for \"vnc\" authentication" msgstr "\"vnc\" の認証モードで使用するパスワード" -#: ../common/org.gnome.Vino.gschema.xml.in.h:20 -msgid "Prompt the user before completing a connection" -msgstr "接続する前にパスワード入力を求めるかどうか" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:21 -msgid "Require encryption" -msgstr "暗号化するかどうか" - -#: ../common/org.gnome.Vino.gschema.xml.in.h:22 +#: ../common/org.gnome.Vino.gschema.xml.in.h:18 msgid "" "The password which the remote user will be prompted for if the \"vnc\" " "authentication method is used. The password specified by the key is base64 " @@ -216,13 +190,32 @@ "の内容は base64 エンコードされます。(正しい base64 ではない) 'keyring' という" "特別な値は、GNOME キーリングに保存されているパスワードを意味します。" -#: ../common/org.gnome.Vino.gschema.xml.in.h:23 +#: ../common/org.gnome.Vino.gschema.xml.in.h:19 +msgid "E-mail address to which the remote desktop URL should be sent" +msgstr "リモート・デスクトップ URL の送信先メールアドレス" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:20 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." +"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." msgstr "" -"'use-alternative-port' キーが TRUE の場合に、サーバーが監視するポート番号 " -"(5000〜50000) です。" +"デスクトップ共有の設定ダイアログに表示されている URL をクリックして、それを" +"メールで送信する宛先を指定します。" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:21 +msgid "Lock the screen when last user disconnect" +msgstr "接続が切れたら画面をロックするかどうか" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:22 +msgid "If true, screen will be locked after the last remote client disconnect." +msgstr "" +"TRUE にすると、最後のリモート・クライアントからの接続が切れた時に画面をロック" +"します。" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:23 +msgid "When the status icon should be shown" +msgstr "ステータス・アイコンの表示方法" #: ../common/org.gnome.Vino.gschema.xml.in.h:24 msgid "" @@ -236,96 +229,109 @@ "る; これがデフォルトの設定)、\"never\" (アイコンは表示しない)" #: ../common/org.gnome.Vino.gschema.xml.in.h:25 -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." -msgstr "" -"デスクトップ共有の設定ダイアログに表示されている URL をクリックして、それを" -"メールで送信する宛先を指定します。" +msgid "When true, disable the background on receive valid session" +msgstr "妥当なセッションに入ったら背景を無効にするかどうか" #: ../common/org.gnome.Vino.gschema.xml.in.h:26 -msgid "When the status icon should be shown" -msgstr "ステータス・アイコンの表示方法" +msgid "Whether we should use UPNP to forward the port in routers" +msgstr "UPnP を使ってポートをフォワードするかどうか" #: ../common/org.gnome.Vino.gschema.xml.in.h:27 -msgid "When true, disable the background on receive valid session" -msgstr "妥当なセッションに入ったら背景を無効にするかどうか" +msgid "" +"If true, we will use UPNP protocol to automatically forward the port used by " +"vino in the router." +msgstr "" +"TRUE にすると、UPnP のプロトコルを利用して vino が使用しているルータ内のポー" +"トを自動的にフォワードします。" #: ../common/org.gnome.Vino.gschema.xml.in.h:28 msgid "Whether we should disable the XDamage extension of X.org" msgstr "X.org の XDamage 拡張機能を無効にするかどうか" #: ../common/org.gnome.Vino.gschema.xml.in.h:29 -msgid "Whether we should use UPNP to forward the port in routers" -msgstr "UPnP を使ってポートをフォワードするかどうか" +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 にすると、その副作用として描画が遅くなりますが、この拡張機能" +"が動作するようになります。" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:30 +msgid "Notify on connect" +msgstr "接続時に通知するかどうか" + +#: ../common/org.gnome.Vino.gschema.xml.in.h:31 +msgid "If true, we will notify, when the user connects to the system." +msgstr "TRUE にすると、システムにユーザーが接続した時に通知を行います。" #: ../capplet/vino-preferences.ui.h:1 -msgid "Al_ways" -msgstr "常に行う(_W)" +msgid "Desktop Sharing Preferences" +msgstr "デスクトップ共有の設定" #: ../capplet/vino-preferences.ui.h:2 -msgid "Allow other users to _view your desktop" -msgstr "他のユーザーが自分のデスクトップを表示できる(_V)" +msgid "Sharing" +msgstr "共有" #: ../capplet/vino-preferences.ui.h:3 -msgid "Automatically _configure UPnP router to open and forward ports" -msgstr "UPnP ルーターがポートを開放／転送するように自動的に設定する(_C)" +msgid "Some of these preferences are locked down" +msgstr "いくつかの設定は変更不可になっています" #: ../capplet/vino-preferences.ui.h:4 -msgid "Desktop Sharing Preferences" -msgstr "デスクトップ共有の設定" +msgid "Allow other users to _view your desktop" +msgstr "他のユーザーが自分のデスクトップを表示できる(_V)" #: ../capplet/vino-preferences.ui.h:5 -msgid "Remote users are able to control your mouse and keyboard" -msgstr "" -"リモートのユーザーがあなたのマウスとキーボードを制御できるようになります" +msgid "Your desktop will be shared" +msgstr "お使いのデスクトップを他のユーザーと共有します" #: ../capplet/vino-preferences.ui.h:6 -msgid "Security" -msgstr "セキュリティ" +msgid "_Allow other users to control your desktop" +msgstr "他のユーザーがデスクトップを操作できる(_A)" #: ../capplet/vino-preferences.ui.h:7 -msgid "Sharing" -msgstr "共有" +msgid "Remote users are able to control your mouse and keyboard" +msgstr "" +"リモートのユーザーがあなたのマウスとキーボードを制御できるようになります" #: ../capplet/vino-preferences.ui.h:8 -msgid "Show Notification Area Icon" -msgstr "通知領域のアイコンを表示" +msgid "Security" +msgstr "セキュリティ" #: ../capplet/vino-preferences.ui.h:9 -msgid "Some of these preferences are locked down" -msgstr "いくつかの設定は変更不可になっています" +msgid "_You must confirm each access to this machine" +msgstr "このマシンへの接続を毎回確認する(_Y)" #: ../capplet/vino-preferences.ui.h:10 -msgid "The router must have the UPnP feature enabled" -msgstr "ルータで UPnP の機能を有効にしておいてください" +msgid "_Require the user to enter this password:" +msgstr "パスワードの入力を要求する(_R):" #: ../capplet/vino-preferences.ui.h:11 -msgid "Your desktop will be shared" -msgstr "お使いのデスクトップを他のユーザーと共有します" +msgid "Automatically _configure UPnP router to open and forward ports" +msgstr "UPnP ルーターがポートを開放／転送するように自動的に設定する(_C)" #: ../capplet/vino-preferences.ui.h:12 -msgid "_Allow other users to control your desktop" -msgstr "他のユーザーがデスクトップを操作できる(_A)" +msgid "The router must have the UPnP feature enabled" +msgstr "ルータで UPnP の機能を有効にしておいてください" -# FIXME-trans: 要確認 #: ../capplet/vino-preferences.ui.h:13 -#, fuzzy -msgid "_Never" -msgstr "行わない(_N)" +msgid "Show Notification Area Icon" +msgstr "通知領域のアイコンを表示" #: ../capplet/vino-preferences.ui.h:14 -msgid "_Only when someone is connected" -msgstr "誰かが接続している時のみ(_O)" +msgid "Al_ways" +msgstr "常に行う(_W)" #: ../capplet/vino-preferences.ui.h:15 -msgid "_Require the user to enter this password:" -msgstr "パスワードの入力を要求する(_R):" +msgid "_Only when someone is connected" +msgstr "誰かが接続している時のみ(_O)" #: ../capplet/vino-preferences.ui.h:16 -msgid "_You must confirm each access to this machine" -msgstr "このマシンへの接続を毎回確認する(_Y)" +msgid "_Never" +msgstr "表示しない(_N)" #: ../server/smclient/eggdesktopfile.c:165 #, c-format @@ -437,7 +443,7 @@ msgid "%s's remote desktop on %s" msgstr "%s@%s さんのリモート・デスクトップ" -#: ../server/vino-prefs.c:109 +#: ../server/vino-prefs.c:111 #, c-format msgid "Received signal %d, exiting." msgstr "シグナル %d を受け取ったので終了します。" @@ -460,6 +466,14 @@ "ロールしようとしています" #: ../server/vino-prompt.ui.h:1 +msgid "Question" +msgstr "質問" + +#: ../server/vino-prompt.ui.h:2 +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." @@ -467,27 +481,19 @@ "別のコンピューターのユーザーがリモートからデスクトップを参照する、または制御" "しようとしています。" -#: ../server/vino-prompt.ui.h:2 -msgid "Another user is trying to view your desktop." -msgstr "別のユーザーがお使いのデスクトップを参照しているようです" - -#: ../server/vino-prompt.ui.h:3 +#: ../server/vino-prompt.ui.h:4 msgid "Do you want to allow them to do so?" msgstr "許可しますか?" -#: ../server/vino-prompt.ui.h:4 -msgid "Question" -msgstr "質問" +#: ../server/vino-prompt.ui.h:5 ../server/vino-util.c:90 +msgid "_Refuse" +msgstr "拒否する(_R)" -#: ../server/vino-prompt.ui.h:5 ../server/vino-util.c:89 +#: ../server/vino-prompt.ui.h:6 ../server/vino-util.c:89 msgid "_Allow" msgstr "許可する(_A)" -#: ../server/vino-prompt.ui.h:6 ../server/vino-util.c:90 -msgid "_Refuse" -msgstr "拒否する(_R)" - -#: ../server/vino-server.c:156 ../server/vino-server.c:179 +#: ../server/vino-server.c:158 ../server/vino-server.c:181 #, c-format msgid "Failed to open connection to bus: %s\n" msgstr "バスへの接続を開けませんでした: %s\n" @@ -556,6 +562,7 @@ "相花 毅 \n" "草野 貴之 \n" "やまねひでき \n" +"Mitsuya Shibata \n" "日本GNOMEユーザー会 " #: ../server/vino-status-icon.c:288 diff -Nru vino-3.4.1/po/Makefile.in.in vino-3.4.2/po/Makefile.in.in --- vino-3.4.1/po/Makefile.in.in 2012-03-26 19:50:41.000000000 +0000 +++ vino-3.4.2/po/Makefile.in.in 2012-05-14 19:02:03.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru vino-3.4.1/server/vino-marshal.c vino-3.4.2/server/vino-marshal.c --- vino-3.4.1/server/vino-marshal.c 2012-03-26 19:53:27.000000000 +0000 +++ vino-3.4.2/server/vino-marshal.c 2012-05-14 19:02:25.000000000 +0000 @@ -8,7 +8,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v)