diff -Nru xpad-4.0/aclocal.m4 xpad-4.1/aclocal.m4 --- xpad-4.0/aclocal.m4 2009-05-11 12:29:43.000000000 +0000 +++ xpad-4.1/aclocal.m4 2011-11-15 17:17:38.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -603,7 +603,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -646,8 +646,9 @@ # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -665,20 +666,21 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -706,7 +708,10 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -719,7 +724,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -728,34 +732,31 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -797,16 +798,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -814,25 +816,24 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES @@ -848,10 +849,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -867,7 +868,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -927,14 +928,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -947,6 +948,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -960,14 +962,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -1024,6 +1026,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -1041,7 +1053,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -1051,19 +1073,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -1201,13 +1227,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -1224,7 +1250,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -1275,8 +1301,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -1284,24 +1310,37 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -1324,7 +1363,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1335,7 +1374,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -1361,13 +1407,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -1376,7 +1422,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -1386,24 +1432,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -1413,14 +1459,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -1437,7 +1483,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -1508,14 +1561,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -1524,16 +1577,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -1586,18 +1652,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru xpad-4.0/AUTHORS xpad-4.1/AUTHORS --- xpad-4.0/AUTHORS 2008-09-28 01:44:10.000000000 +0000 +++ xpad-4.1/AUTHORS 2011-11-15 17:17:05.000000000 +0000 @@ -1,2 +1,3 @@ Michael Terry Jeroen Vermeulen +Sergei Riaguzov diff -Nru xpad-4.0/autopackage/Makefile.in xpad-4.1/autopackage/Makefile.in --- xpad-4.0/autopackage/Makefile.in 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/autopackage/Makefile.in 2011-11-15 17:17:40.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -40,6 +42,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = default.apspec +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -102,9 +105,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -176,9 +182,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu autopackage/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu autopackage/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu autopackage/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu autopackage/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -196,6 +202,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): default.apspec: $(top_builddir)/config.status $(srcdir)/default.apspec.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ tags: TAGS @@ -221,13 +228,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -255,6 +266,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -274,6 +286,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -282,18 +296,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -326,6 +350,7 @@ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru xpad-4.0/config.h.in xpad-4.1/config.h.in --- xpad-4.0/config.h.in 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/config.h.in 2011-11-15 17:17:40.000000000 +0000 @@ -75,6 +75,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -Nru xpad-4.0/configure xpad-4.1/configure --- xpad-4.0/configure 2009-05-11 12:29:45.000000000 +0000 +++ xpad-4.1/configure 2011-11-15 17:17:39.000000000 +0000 @@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for Xpad 4.0. +# Generated by GNU Autoconf 2.67 for Xpad 4.1. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -22,23 +26,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -46,7 +42,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +59,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,13 +82,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -96,15 +91,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -116,12 +111,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -133,330 +132,300 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: xpad-hackers@lists.launchpad.net about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi - - fi - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -exitcode=0 -if as_func_success; then - : +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo as_func_success failed. -fi + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi -if as_func_ret_success; then - : +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_ret_success failed. + as_expr=false fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -473,8 +442,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -484,29 +452,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -536,7 +493,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -555,10 +512,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -572,11 +529,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -591,14 +548,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Xpad' PACKAGE_TARNAME='xpad' -PACKAGE_VERSION='4.0' -PACKAGE_STRING='Xpad 4.0' +PACKAGE_VERSION='4.1' +PACKAGE_STRING='Xpad 4.1' PACKAGE_BUGREPORT='xpad-hackers@lists.launchpad.net' +PACKAGE_URL='' ac_unique_file="src/xpad-app.c" # Factoring default headers for most tests. @@ -637,7 +594,9 @@ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS DEBUG_CFLAGS MKINSTALLDIRS @@ -656,6 +615,8 @@ GREP GTK_LIBS GTK_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG X_EXTRA_LIBS X_LIBS @@ -764,6 +725,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -792,6 +754,8 @@ XMKMF CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR GTK_CFLAGS GTK_LIBS' @@ -856,8 +820,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -902,8 +867,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -929,8 +893,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1134,8 +1097,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1151,8 +1113,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1182,17 +1143,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1209,15 +1170,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1240,8 +1199,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1255,8 +1213,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1271,11 +1229,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1314,13 +1270,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1346,7 +1300,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 Xpad 4.0 to adapt to many kinds of systems. +\`configure' configures Xpad 4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1314,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1416,7 +1370,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xpad 4.0:";; + short | recursive ) echo "Configuration of Xpad 4.1:";; esac cat <<\_ACEOF @@ -1431,7 +1385,7 @@ --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support - --enable-debug=no/yes turn on debugging default=no + --enable-debug=no/yes turn on debugging [default=no] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1444,11 +1398,15 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory XMKMF Path to xmkmf, Makefile generator for X Window System CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config @@ -1518,22 +1476,431 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xpad configure 4.0 -generated by GNU Autoconf 2.63 +Xpad configure 4.1 +generated by GNU Autoconf 2.67 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ----------------------------------------------- ## +## Report this to xpad-hackers@lists.launchpad.net ## +## ----------------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xpad $as_me 4.0, which was -generated by GNU Autoconf 2.63. Invocation command line was +It was created by Xpad $as_me 4.1, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1569,8 +1936,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1607,9 +1974,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1625,13 +1992,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1643,11 +2010,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1656,13 +2021,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1681,11 +2046,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1698,11 +2061,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1716,11 +2077,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1734,46 +2093,53 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1784,19 +2150,23 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -1804,7 +2174,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1819,11 +2189,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -1833,17 +2203,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -1855,43 +2225,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1905,7 +2252,7 @@ # Sets up automake. -am__api_version='1.10' +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -1924,9 +2271,7 @@ fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1952,10 +2297,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -1963,11 +2308,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2004,7 +2349,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2020,7 +2365,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2031,21 +2376,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2055,11 +2413,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2068,13 +2423,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2089,20 +2441,136 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2110,7 +2578,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2122,11 +2590,12 @@ esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2134,11 +2603,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2151,9 +2619,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2164,24 +2632,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2189,11 +2657,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2201,7 +2669,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2211,11 +2679,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2235,9 +2703,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2253,7 +2719,7 @@ # Define the identity of the package. PACKAGE='xpad' - VERSION='4.0' + VERSION='4.1' cat >>confdefs.h <<_ACEOF @@ -2281,108 +2747,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -2403,44 +2767,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2465,9 +2829,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2478,24 +2842,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2505,9 +2869,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2518,24 +2882,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2544,7 +2908,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2558,9 +2922,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2571,24 +2935,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2598,9 +2962,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2612,18 +2976,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2642,10 +3006,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2657,9 +3021,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2670,24 +3034,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2701,9 +3065,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2714,24 +3078,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2744,7 +3108,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2755,57 +3119,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2821,8 +3165,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -2838,17 +3182,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2865,7 +3209,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2884,84 +3228,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2976,32 +3277,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5 ; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3013,17 +3365,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3036,31 +3388,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3074,37 +3418,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3113,20 +3436,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3137,35 +3456,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3176,36 +3471,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3216,42 +3487,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3268,18 +3514,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3336,32 +3578,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3372,17 +3591,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3392,9 +3613,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3420,6 +3641,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3437,7 +3663,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3447,19 +3683,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -3483,7 +3723,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3501,7 +3741,7 @@ # Check whether --enable-binreloc was given. -if test "${enable_binreloc+set}" = set; then +if test "${enable_binreloc+set}" = set; then : enableval=$enable_binreloc; enable_binreloc=$enableval else enable_binreloc=auto @@ -3509,7 +3749,7 @@ # Check whether --enable-binreloc-threads was given. -if test "${enable_binreloc_threads+set}" = set; then +if test "${enable_binreloc_threads+set}" = set; then : enableval=$enable_binreloc_threads; enable_binreloc_threads=$enableval else enable_binreloc_threads=no @@ -3519,27 +3759,28 @@ BINRELOC_CFLAGS= BINRELOC_LIBS= if test "x$enable_binreloc" = "xauto"; then - { $as_echo "$as_me:$LINENO: checking for /proc/self/maps" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/self/maps" >&5 $as_echo_n "checking for /proc/self/maps... " >&6; } -if test "${ac_cv_file__proc_self_maps+set}" = set; then +if test "${ac_cv_file__proc_self_maps+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/proc/self/maps"; then ac_cv_file__proc_self_maps=yes else ac_cv_file__proc_self_maps=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__proc_self_maps" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__proc_self_maps" >&5 $as_echo "$ac_cv_file__proc_self_maps" >&6; } +if test "x$ac_cv_file__proc_self_maps" = x""yes; then : + +fi - { $as_echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether everything is installed to the same prefix" >&5 $as_echo_n "checking whether everything is installed to the same prefix... " >&6; } -if test "${br_cv_valid_prefixes+set}" = set; then +if test "${br_cv_valid_prefixes+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -3553,12 +3794,12 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $br_cv_valid_prefixes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $br_cv_valid_prefixes" >&5 $as_echo "$br_cv_valid_prefixes" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether binary relocation support should be enabled" >&5 $as_echo_n "checking whether binary relocation support should be enabled... " >&6; } -if test "${br_cv_binreloc+set}" = set; then +if test "${br_cv_binreloc+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$enable_binreloc" = "xyes"; then @@ -3574,30 +3815,23 @@ br_cv_binreloc=no fi fi -{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $br_cv_binreloc" >&5 $as_echo "$br_cv_binreloc" >&6; } if test "x$br_cv_binreloc" = "xyes"; then BINRELOC_CFLAGS="-DENABLE_BINRELOC" -cat >>confdefs.h <<\_ACEOF -#define ENABLE_BINRELOC /**/ -_ACEOF +$as_echo "#define ENABLE_BINRELOC /**/" >>confdefs.h if test "x$enable_binreloc_threads" = "xyes"; then - -{ $as_echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_getspecific in -lpthread" >&5 $as_echo_n "checking for pthread_getspecific in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then +if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3615,43 +3849,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_getspecific=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_getspecific=no + ac_cv_lib_pthread_pthread_getspecific=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_getspecific" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_getspecific" >&5 $as_echo "$ac_cv_lib_pthread_pthread_getspecific" >&6; } -if test "x$ac_cv_lib_pthread_pthread_getspecific" = x""yes; then +if test "x$ac_cv_lib_pthread_pthread_getspecific" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBPTHREAD 1 _ACEOF @@ -3662,9 +3871,9 @@ fi - { $as_echo "$as_me:$LINENO: checking whether binary relocation should use threads" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether binary relocation should use threads" >&5 $as_echo_n "checking whether binary relocation should use threads... " >&6; } -if test "${br_cv_binreloc_threads+set}" = set; then +if test "${br_cv_binreloc_threads+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$enable_binreloc_threads" = "xyes"; then @@ -3677,22 +3886,18 @@ br_cv_binreloc_threads=no fi fi -{ $as_echo "$as_me:$LINENO: result: $br_cv_binreloc_threads" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $br_cv_binreloc_threads" >&5 $as_echo "$br_cv_binreloc_threads" >&6; } if test "x$br_cv_binreloc_threads" = "xyes"; then BINRELOC_LIBS="-lpthread" -cat >>confdefs.h <<\_ACEOF -#define BR_PTHREADS 1 -_ACEOF +$as_echo "#define BR_PTHREADS 1" >>confdefs.h else BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0" -cat >>confdefs.h <<\_ACEOF -#define BR_PTHREADS 0 -_ACEOF +$as_echo "#define BR_PTHREADS 0" >>confdefs.h fi fi @@ -3709,9 +3914,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3722,24 +3927,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3749,9 +3954,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3762,24 +3967,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3788,7 +3993,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3802,9 +4007,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3815,24 +4020,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3842,9 +4047,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3856,18 +4061,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -3886,10 +4091,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3901,9 +4106,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3914,24 +4119,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3945,9 +4150,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3958,24 +4163,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3988,7 +4193,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3999,62 +4204,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4068,37 +4253,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -4107,20 +4271,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4131,35 +4291,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4170,36 +4306,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4210,42 +4322,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4262,18 +4349,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4330,32 +4413,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4366,17 +4426,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4386,9 +4448,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4414,6 +4476,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -4431,7 +4498,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -4441,19 +4518,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -4477,7 +4558,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -4492,104 +4573,12 @@ fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -4597,7 +4586,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -4607,26 +4596,26 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=yes fi - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 $as_echo "$USE_NLS" >&6; } @@ -4634,35 +4623,31 @@ case "$am__api_version" in 1.01234) - { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac if test -n "0.31"; then - { $as_echo "$as_me:$LINENO: checking for intltool >= 0.31" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.31" >&5 $as_echo_n "checking for intltool >= 0.31... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.31 | 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:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 + { $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" || - { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.31 or later." >&5 -$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.31 or later." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Your intltool is too old. You need intltool 0.31 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -4675,14 +4660,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4690,19 +4675,19 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 $as_echo "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -4715,14 +4700,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4730,19 +4715,19 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 $as_echo "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -4755,14 +4740,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4770,18 +4755,16 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 $as_echo "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } + 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 $< $@' @@ -4903,9 +4886,9 @@ # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -4918,14 +4901,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4933,19 +4916,19 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then +if test "${ac_cv_path_MSGMERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -4958,14 +4941,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -4973,19 +4956,19 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -4998,14 +4981,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -5013,19 +4996,19 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5038,14 +5021,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -5054,33 +5037,29 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -5093,14 +5072,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -5108,41 +5087,35 @@ fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 $as_echo "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 -$as_echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 -$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi if test "xno-xml" != "xno-xml"; then - { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 $as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -5152,11 +5125,7 @@ # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5168,120 +5137,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -5293,10 +5155,8 @@ ;; esac fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi @@ -5310,14 +5170,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -5332,11 +5192,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5345,78 +5201,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi @@ -5428,7 +5240,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -5439,11 +5251,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5452,87 +5260,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -5542,12 +5303,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for X" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } # Check whether --with-x was given. -if test "${with_x+set}" = set; then +if test "${with_x+set}" = set; then : withval=$with_x; fi @@ -5557,10 +5318,8 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 -$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else # One or both of the vars are not set, and there is no cached value. @@ -5577,7 +5336,7 @@ @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -5608,21 +5367,25 @@ # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include +/usr/X11R7/include /usr/X11R6/include /usr/X11R5/include /usr/X11R4/include /usr/include/X11 +/usr/include/X11R7 /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 /usr/local/X11/include +/usr/local/X11R7/include /usr/local/X11R6/include /usr/local/X11R5/include /usr/local/X11R4/include /usr/local/include/X11 +/usr/local/include/X11R7 /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 @@ -5644,37 +5407,14 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # We can compile using X headers with no special include directory. ac_x_includes= else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir @@ -5682,8 +5422,7 @@ fi done fi - -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then @@ -5692,11 +5431,7 @@ # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -5707,35 +5442,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! @@ -5747,10 +5459,8 @@ done done fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no case $ac_x_includes,$ac_x_libraries in #( @@ -5771,7 +5481,7 @@ fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:$LINENO: result: $have_x" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 $as_echo "$have_x" >&6; } no_x=yes else @@ -5782,16 +5492,14 @@ ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 $as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF +$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -5804,16 +5512,12 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 $as_echo_n "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5824,40 +5528,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5868,46 +5545,19 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: neither works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 $as_echo "neither works" >&6; } fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS fi @@ -5923,11 +5573,7 @@ # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5945,44 +5591,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6000,59 +5619,30 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6070,52 +5660,25 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -6126,105 +5689,20 @@ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -$as_echo_n "checking for gethostbyname... " >&6; } -if test "${ac_cv_func_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_gethostbyname || defined __stub___gethostbyname -choke me -#endif - -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_gethostbyname=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +if test "x$ac_cv_func_gethostbyname" = x""yes; then : - ac_cv_func_gethostbyname=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -$as_echo "$ac_cv_func_gethostbyname" >&6; } - if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6242,59 +5720,30 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6312,43 +5761,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bsd_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no + ac_cv_lib_bsd_gethostbyname=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -6362,33 +5786,21 @@ # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - { $as_echo "$as_me:$LINENO: checking for connect" >&5 -$as_echo_n "checking for connect... " >&6; } -if test "${ac_cv_func_connect+set}" = set; then + ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +if test "x$ac_cv_func_connect" = x""yes; then : + +fi + + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -6397,13 +5809,6 @@ extern "C" #endif char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_connect || defined __stub___connect -choke me -#endif - int main () { @@ -6412,55 +5817,38 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_connect=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_connect=no + ac_cv_lib_socket_connect=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" +if test "x$ac_cv_func_remove" = x""yes; then : + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -$as_echo "$ac_cv_func_connect" >&6; } - if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then + if test $ac_cv_func_remove = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +$as_echo_n "checking for remove in -lposix... " >&6; } +if test "${ac_cv_lib_posix_remove+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lposix $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6469,316 +5857,47 @@ #ifdef __cplusplus extern "C" #endif -char connect (); +char remove (); int main () { -return connect (); +return remove (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_socket_connect=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix_remove=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_connect=no + ac_cv_lib_posix_remove=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - { $as_echo "$as_me:$LINENO: checking for remove" >&5 -$as_echo_n "checking for remove... " >&6; } -if test "${ac_cv_func_remove+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_remove || defined __stub___remove -choke me -#endif - -int -main () -{ -return remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_remove=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_remove=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -$as_echo "$ac_cv_func_remove" >&6; } - - if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char remove (); -int -main () -{ -return remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_posix_remove=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix_remove=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +$as_echo "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { $as_echo "$as_me:$LINENO: checking for shmat" >&5 -$as_echo_n "checking for shmat... " >&6; } -if test "${ac_cv_func_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shmat || defined __stub___shmat -choke me -#endif - -int -main () -{ -return shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shmat=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shmat=no -fi + ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +if test "x$ac_cv_func_shmat" = x""yes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -$as_echo "$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6796,43 +5915,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -6848,18 +5942,14 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -6877,43 +5967,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -6923,13 +5988,17 @@ + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -6942,14 +6011,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6957,10 +6026,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6970,9 +6039,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -6985,14 +6054,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -7000,10 +6069,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7012,7 +6081,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7025,63 +6094,60 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi - fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gio-2.0\"") >&5 +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gio-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gio-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12 gio-2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gio-2.0\"") >&5 +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gio-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gio-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12 gio-2.0" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -7089,25 +6155,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12 gio-2.0"` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.12 gio-2.0" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12 gio-2.0"` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.12 gio-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.12 gio-2.0) were not met: - -$GTK_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.12 gio-2.0) were not met: + as_fn_error $? "Package requirements (gtk+-2.0 >= 2.12 gio-2.0) were not met: $GTK_PKG_ERRORS @@ -7116,23 +6171,13 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -7141,29 +6186,24 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi # Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then +if test "${ac_cv_c_const+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7223,47 +6263,24 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 $as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const /**/ -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -7274,7 +6291,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -7294,7 +6311,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -7309,26 +6326,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -7342,7 +6357,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -7362,7 +6377,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -7377,12 +6392,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -7390,21 +6403,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7419,48 +6428,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7470,18 +6454,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7491,14 +6471,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7525,118 +6501,33 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7646,102 +6537,9 @@ done -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 -$as_echo_n "checking for size_t... " >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_size_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((size_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_size_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -$as_echo "$ac_cv_type_size_t" >&6; } -if test "x$ac_cv_type_size_t" = x""yes; then - : else cat >>confdefs.h <<_ACEOF @@ -7760,151 +6558,12 @@ _ACEOF - -for ac_header in locale.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------------- ## -## Report this to xpad-hackers@lists.launchpad.net ## -## ----------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LOCALE_H 1 _ACEOF fi @@ -7912,16 +6571,12 @@ done if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -7932,46 +6587,19 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_val_LC_MESSAGES=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 $as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi fi @@ -7984,155 +6612,20 @@ XGETTEXT=: INTLLIBS= - if test "${ac_cv_header_libintl_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 -$as_echo_n "checking libintl.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 -$as_echo_n "checking libintl.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------------- ## -## Report this to xpad-hackers@lists.launchpad.net ## -## ----------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } - -fi -if test "x$ac_cv_header_libintl_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = x""yes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then +if test "${gt_cv_func_ngettext_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -8145,54 +6638,25 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_ngettext_libc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 $as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then +if test "${gt_cv_func_dgettext_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -8200,146 +6664,31 @@ int main () { -return !dgettext ("","") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_dgettext_libc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +return !dgettext ("","") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + gt_cv_func_dgettext_libc=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -8354,18 +6703,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8383,55 +6728,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_bindtextdomain=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8449,55 +6765,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8515,43 +6802,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes fi @@ -8561,22 +6823,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:$LINENO: result: " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8594,55 +6852,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -8660,43 +6889,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -8718,102 +6922,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -8843,15 +6957,13 @@ if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -8876,118 +6988,28 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DCGETTEXT 1 _ACEOF fi done MSGFMT_OPTS= - { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF @@ -9002,14 +7024,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 +if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -else { $as_echo "$as_me:$LINENO: result: no" >&5 +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 @@ -9017,9 +7039,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -9032,14 +7054,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -9048,19 +7070,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -9084,145 +7106,34 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - CATOBJEXT=.gmo - DATADIRNAME=share -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () { -return bind_textdomain_codeset (); +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes +if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + case $host in + *-*-solaris*) + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -9237,10 +7148,8 @@ ;; esac fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -9254,9 +7163,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +$as_echo "#define ENABLE_NLS 1" >>confdefs.h fi @@ -9264,7 +7171,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi @@ -9297,7 +7204,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -9322,7 +7229,7 @@ fi done LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 $as_echo "$LINGUAS" >&6; } fi @@ -9374,7 +7281,7 @@ # Determines if we're debugging. # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; enable_debug="$enableval" else enable_debug=no @@ -9417,13 +7324,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -9431,8 +7338,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -9455,11 +7362,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -9473,40 +7380,40 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" @@ -9517,9 +7424,10 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -9529,17 +7437,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -9547,23 +7456,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -9571,7 +7472,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -9582,7 +7489,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -9605,13 +7512,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -9621,15 +7521,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -9641,12 +7541,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -9658,7 +7562,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -9672,8 +7658,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -9693,76 +7683,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -9791,8 +7730,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -9811,10 +7798,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -9829,13 +7816,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xpad $as_me 4.0, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by Xpad $as_me 4.1, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9867,13 +7860,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -9892,16 +7887,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xpad config.status 4.0 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +Xpad config.status 4.1 +configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -9919,11 +7915,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -9937,27 +7938,29 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -9965,11 +7968,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -10033,9 +8035,7 @@ "autopackage/default.apspec") CONFIG_FILES="$CONFIG_FILES autopackage/default.apspec" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -10062,7 +8062,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -10073,11 +8073,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -10085,7 +8081,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -10102,24 +8104,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10141,7 +8137,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -10155,7 +8151,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -10208,22 +8204,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -10251,9 +8253,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10338,9 +8338,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -10353,9 +8351,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10383,12 +8379,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -10399,7 +8393,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -10412,9 +8406,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -10442,47 +8434,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -10539,7 +8491,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -10549,12 +8500,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -10564,7 +8514,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -10593,26 +8543,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -10623,25 +8569,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -10679,7 +8619,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -10774,47 +8714,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -10826,9 +8726,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -10851,15 +8749,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -10880,10 +8775,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru xpad-4.0/configure.ac xpad-4.1/configure.ac --- xpad-4.0/configure.ac 2009-01-11 16:44:20.000000000 +0000 +++ xpad-4.1/configure.ac 2011-11-15 17:17:31.000000000 +0000 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. # Sets up autoconf. -AC_INIT([Xpad],[4.0],[xpad-hackers@lists.launchpad.net]) +AC_INIT([Xpad],[4.1],[xpad-hackers@lists.launchpad.net]) AC_CONFIG_SRCDIR(src/xpad-app.c) AC_CONFIG_HEADERS([config.h:config.h.in]) diff -Nru xpad-4.0/debian/changelog xpad-4.1/debian/changelog --- xpad-4.0/debian/changelog 2011-11-18 15:26:32.000000000 +0000 +++ xpad-4.1/debian/changelog 2012-07-16 17:59:20.000000000 +0000 @@ -1,3 +1,29 @@ +xpad (4.1-0estobuntu~precise1) precise; urgency=low + + [ Michael Terry ] + * debian/patches/single-include.patch: + - Whoops, uploaded a FTBFS package. This fixes the build by not + including private glib headers. + + [ Guido Tabbernuk ] + * Build for Precise. + + -- Guido Tabbernuk Mon, 16 Jul 2012 20:58:49 +0300 + +xpad (4.1-1ubuntu1) quantal; urgency=low + + * Merge from Debian testing. Remaining changes: + - Build-Depend on libmagickcore4-extra | libmagickcore-extra. + + -- Michael Terry Tue, 22 May 2012 15:37:35 -0400 + +xpad (4.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches/576770.diff: Removed. + + -- Bart Martens Sun, 29 Apr 2012 17:19:10 +0000 + xpad (4.0-5ubuntu2) precise; urgency=low * debian/control: diff -Nru xpad-4.0/debian/control xpad-4.1/debian/control --- xpad-4.0/debian/control 2011-11-18 15:31:10.000000000 +0000 +++ xpad-4.1/debian/control 2012-05-22 19:41:54.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Bart Martens Build-Depends: debhelper (>= 7.0.50), autotools-dev, libgtk2.0-dev (>> 2.6.0), imagemagick, intltool (>= 0.31), libmagickcore4-extra | libmagickcore-extra -Standards-Version: 3.8.4 +Standards-Version: 3.9.3 Homepage: http://mterry.name/xpad/ Package: xpad diff -Nru xpad-4.0/debian/patches/576770.diff xpad-4.1/debian/patches/576770.diff --- xpad-4.0/debian/patches/576770.diff 2010-04-11 16:23:04.000000000 +0000 +++ xpad-4.1/debian/patches/576770.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Index: xpad-4.0/src/xpad-pad.c -=================================================================== ---- xpad-4.0.orig/src/xpad-pad.c 2010-04-11 18:19:18.000000000 +0200 -+++ xpad-4.0/src/xpad-pad.c 2010-04-11 18:22:32.000000000 +0200 -@@ -275,7 +275,6 @@ - "gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving pad x,y work */ - "skip-pager-hint", !xpad_settings_get_has_decorations (xpad_settings ()), - "skip-taskbar-hint", !xpad_settings_get_has_decorations (xpad_settings ()), -- "type", GTK_WINDOW_TOPLEVEL, - "type-hint", GDK_WINDOW_TYPE_HINT_NORMAL, - "window-position", GTK_WIN_POS_MOUSE, - "child", vbox, diff -Nru xpad-4.0/debian/patches/series xpad-4.1/debian/patches/series --- xpad-4.0/debian/patches/series 2010-04-11 16:20:23.000000000 +0000 +++ xpad-4.1/debian/patches/series 2012-05-22 20:00:18.000000000 +0000 @@ -1,2 +1,2 @@ missing.diff -576770.diff +single-include.patch diff -Nru xpad-4.0/debian/patches/single-include.patch xpad-4.1/debian/patches/single-include.patch --- xpad-4.0/debian/patches/single-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ xpad-4.1/debian/patches/single-include.patch 2012-05-22 20:00:50.000000000 +0000 @@ -0,0 +1,13 @@ +Description: New glib requires a single include +Author: Michael Terry + +--- xpad-4.1.orig/src/xpad-undo.c ++++ xpad-4.1/src/xpad-undo.c +@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place, Suite + #include "../config.h" + #include + #include +-#include + #include "xpad-undo.h" + #include "xpad-text-buffer.h" + diff -Nru xpad-4.0/depcomp xpad-4.1/depcomp --- xpad-4.0/depcomp 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/depcomp 2011-11-15 17:17:40.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,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 @@ -87,6 +85,15 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -585,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru xpad-4.0/doc/Makefile.in xpad-4.1/doc/Makefile.in --- xpad-4.0/doc/Makefile.in 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/doc/Makefile.in 2011-11-15 17:17:40.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -40,8 +42,30 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff @@ -106,9 +130,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -179,9 +206,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -199,51 +226,45 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-man1: $(man1_MANS) $(man_MANS) +$(am__aclocal_m4_deps): +install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ + @list=''; test -n "$(man1dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ done; \ - for i in $$list; do \ - if test -f $$i; then file=$$i; \ - else file=$(srcdir)/$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } tags: TAGS TAGS: @@ -252,6 +273,19 @@ distdir: $(DISTFILES) + @list='$(MANS)'; if test -n "$$list"; then \ + list=`for p in $$list; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ + if test -n "$$list" && \ + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ + echo " typically \`make maintainer-clean' will remove them" >&2; \ + exit 1; \ + else :; fi; \ + else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -267,13 +301,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -304,6 +342,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -322,6 +361,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -330,18 +371,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-man1 install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -377,6 +428,7 @@ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ uninstall-am uninstall-man uninstall-man1 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru xpad-4.0/images/Makefile.in xpad-4.1/images/Makefile.in --- xpad-4.0/images/Makefile.in 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/images/Makefile.in 2011-11-15 17:17:40.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -40,6 +42,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -47,9 +50,23 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(icondir)" -nobase_iconDATA_INSTALL = $(install_sh_DATA) DATA = $(nobase_icon_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -111,9 +128,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -191,9 +211,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu images/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu images/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -211,25 +231,30 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-nobase_iconDATA: $(nobase_icon_DATA) @$(NORMAL_INSTALL) test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" - @$(am__vpath_adj_setup) \ - list='$(nobase_icon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - $(am__vpath_adj) \ - echo " $(nobase_iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ - $(nobase_iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ + @list='$(nobase_icon_DATA)'; test -n "$(icondir)" || list=; \ + $(am__nobase_list) | while read dir files; do \ + xfiles=; for file in $$files; do \ + if test -f "$$file"; then xfiles="$$xfiles $$file"; \ + else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo "$(MKDIR_P) '$(DESTDIR)$(icondir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)/$$dir"; }; \ + echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(icondir)/$$dir'"; \ + $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(icondir)/$$dir" || exit $$?; }; \ done uninstall-nobase_iconDATA: @$(NORMAL_UNINSTALL) - @$(am__vpath_adj_setup) \ - list='$(nobase_icon_DATA)'; for p in $$list; do \ - $(am__vpath_adj) \ - echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ - rm -f "$(DESTDIR)$(icondir)/$$f"; \ - done + @list='$(nobase_icon_DATA)'; test -n "$(icondir)" || list=; \ + $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icondir)" && rm -f $$files tags: TAGS TAGS: @@ -253,13 +278,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -290,6 +319,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -308,6 +338,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -315,21 +347,30 @@ install-data-am: install-nobase_iconDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -351,7 +392,6 @@ uninstall-am: uninstall-nobase_iconDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook - .MAKE: install-am install-data-am install-strip uninstall-am .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -376,6 +416,7 @@ echo "*** Icon cache not updated. After (un)install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru xpad-4.0/INSTALL xpad-4.1/INSTALL --- xpad-4.0/INSTALL 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/INSTALL 2011-11-15 17:17:40.000000000 +0000 @@ -2,10 +2,12 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,7 +222,7 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,6 +237,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +262,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +351,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -Nru xpad-4.0/install-sh xpad-4.1/install-sh --- xpad-4.0/install-sh 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/install-sh 2011-11-15 17:17:40.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,5 +515,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru xpad-4.0/Makefile.in xpad-4.1/Makefile.in --- xpad-4.0/Makefile.in 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/Makefile.in 2011-11-15 17:17:40.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -45,6 +47,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -59,12 +62,29 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(desktopdir)" -dist_desktopDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_desktop_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -72,9 +92,34 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.bz2 distuninstallcheck_listfiles = find . -type f -print @@ -138,9 +183,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -214,15 +262,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -238,9 +286,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ @@ -252,7 +301,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -261,20 +310,23 @@ install-dist_desktopDATA: $(dist_desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" - @list='$(dist_desktop_DATA)'; for p in $$list; do \ + @list='$(dist_desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(dist_desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ - $(dist_desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ done uninstall-dist_desktopDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_desktop_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ - rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ - done + @list='$(dist_desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(desktopdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -283,7 +335,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -300,7 +352,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -308,7 +360,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -334,16 +386,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -358,7 +410,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -370,7 +422,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -379,36 +431,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -424,29 +481,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -454,11 +526,13 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -470,6 +544,10 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -493,15 +571,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -509,9 +589,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -533,13 +615,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -584,6 +668,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -604,6 +689,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -612,18 +699,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -646,24 +743,24 @@ uninstall-am: uninstall-dist_desktopDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_desktopDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am \ + dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_desktopDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-dist_desktopDATA @@ -673,6 +770,7 @@ dist-hook: $(MAKE) -C "$(srcdir)/po" "$(GETTEXT_PACKAGE).pot" cp "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" "$(distdir)/po/" + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru xpad-4.0/missing xpad-4.1/missing --- xpad-4.0/missing 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/missing 2011-11-15 17:17:40.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,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 @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru xpad-4.0/NEWS xpad-4.1/NEWS --- xpad-4.0/NEWS 2009-05-11 12:25:07.000000000 +0000 +++ xpad-4.1/NEWS 2011-11-15 17:17:05.000000000 +0000 @@ -1,3 +1,10 @@ +Version 4.1 +* Undo/Redo for xpad and bug-fixes. Feature by Sergei Riaguzov +* Bug #490445: crash when right-clicking on tray icon to display list of notes. Patch by David Hull +* Bug #360142: Add keyboard shortcuts for formatting. Patch by Dennis Hilmar +* Bug #591978: xpad critical start. Patch by OBATA Akio + + Version 4.0 * Added --toggle (between --hide and --show). Patch by Paul Ivanov. * Updated French, Japanese, Russian, Spanish, and Swedish translations diff -Nru xpad-4.0/po/af.po xpad-4.1/po/af.po --- xpad-4.0/po/af.po 2009-05-11 01:52:14.000000000 +0000 +++ xpad-4.1/po/af.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,103 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad 1.13\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Afrikaans \n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/help.c:73 -msgid "Help" -msgstr "Hulp" - -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 -msgid "Xpad" -msgstr "Xpad" - -#: ../src/xpad-app.c:455 -#, c-format -msgid "Could not open directory %s." -msgstr "Kon nie gids %s oopmaak nie." - -#: ../src/xpad-app.c:458 -msgid "" -"This directory is needed to store preference and pad information. Xpad will " -"close now." -msgstr "" -"Hierdie gids word benodig om voorkeure en boekie-inligting te stoor. Xpad " -"sal nou afsluit." - -#: ../src/xpad-pad.c:649 -msgid "Delete this pad?" -msgstr "Vee hierdie boekie uit?" - -#: ../src/xpad-pad.c:650 -msgid "All text of this pad will be irrevocably lost." -msgstr "Alle teks in hierdie boekie sal onherroeplik verlore wees." - -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Petri Jooste https://launchpad.net/~rkwjpj\n" -"\n" -"Launchpad Contributions:\n" -" Michael Terry https://launchpad.net/~mterry\n" -" Petri Jooste https://launchpad.net/~rkwjpj" - -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 -msgid "_Show All" -msgstr "_Wys Alles" - -#: ../src/xpad-preferences.c:179 -msgid "_Edit lock" -msgstr "_Redigeer slot" - -#: ../src/xpad-preferences.c:252 -msgid "Options" -msgstr "Opsies" - -#: ../src/xpad-toolbar.c:74 -msgid "Clear Pad Contents" -msgstr "Maak boekie leeg" - -#: ../src/xpad-toolbar.c:75 -msgid "Close and Save Pad" -msgstr "Maak toe en stoor boekie" - -#: ../src/xpad-toolbar.c:76 -msgid "Delete Pad" -msgstr "Vee boekie uit." - -#: ../src/xpad-toolbar.c:77 -msgid "Open New Pad" -msgstr "Open nuwe boekie" - -#: ../src/xpad-toolbar.c:79 -msgid "Edit Pad Properties" -msgstr "Redigeer boekie-eienskappe" - -#: ../src/xpad-toolbar.c:80 -msgid "Close All Pads" -msgstr "Maak alle boekies toe" - -#: ../xpad.desktop.in.h:1 -msgid "Jot down notes for later" -msgstr "Maak notas vir later" - -#: ../xpad.desktop.in.h:2 -msgid "Sticky Notes" -msgstr "Plaknotas (klewerig)" - -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -138,115 +54,163 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/help.c:73 +msgid "Help" +msgstr "Hulp" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 +msgid "Xpad" +msgstr "Xpad" + +#: ../src/xpad-app.c:457 +#, c-format +msgid "Could not open directory %s." +msgstr "Kon nie gids %s oopmaak nie." + +#: ../src/xpad-app.c:460 +msgid "" +"This directory is needed to store preference and pad information. Xpad will " +"close now." +msgstr "" +"Hierdie gids word benodig om voorkeure en boekie-inligting te stoor. Xpad " +"sal nou afsluit." + +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:653 +msgid "Delete this pad?" +msgstr "Vee hierdie boekie uit?" + +#: ../src/xpad-pad.c:654 +msgid "All text of this pad will be irrevocably lost." +msgstr "Alle teks in hierdie boekie sal onherroeplik verlore wees." + +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Petri Jooste https://launchpad.net/~rkwjpj\n" +"\n" +"Launchpad Contributions:\n" +" Michael Terry https://launchpad.net/~mterry\n" +" Petri Jooste https://launchpad.net/~rkwjpj" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 +msgid "_Show All" +msgstr "_Wys Alles" + +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "" @@ -298,6 +262,10 @@ msgid "Use colors from theme" msgstr "" +#: ../src/xpad-preferences.c:179 +msgid "_Edit lock" +msgstr "_Redigeer slot" + #: ../src/xpad-preferences.c:180 msgid "_Pads start on all workspaces" msgstr "" @@ -310,19 +278,39 @@ msgid "Xpad Preferences" msgstr "" +#: ../src/xpad-preferences.c:252 +msgid "Options" +msgstr "Opsies" + +#: ../src/xpad-toolbar.c:74 +msgid "Clear Pad Contents" +msgstr "Maak boekie leeg" + #: ../src/xpad-toolbar.c:74 msgid "Add C_lear to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:75 +msgid "Close and Save Pad" +msgstr "Maak toe en stoor boekie" + +#: ../src/xpad-toolbar.c:75 msgid "Add _Close to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:76 +msgid "Delete Pad" +msgstr "Vee boekie uit." + +#: ../src/xpad-toolbar.c:76 msgid "Add _Delete to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:77 +msgid "Open New Pad" +msgstr "Open nuwe boekie" + +#: ../src/xpad-toolbar.c:77 msgid "Add _New to Toolbar" msgstr "" @@ -335,10 +323,18 @@ msgstr "" #: ../src/xpad-toolbar.c:79 +msgid "Edit Pad Properties" +msgstr "Redigeer boekie-eienskappe" + +#: ../src/xpad-toolbar.c:79 msgid "Add Proper_ties to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:80 +msgid "Close All Pads" +msgstr "Maak alle boekies toe" + +#: ../src/xpad-toolbar.c:80 msgid "Add Close _All to Toolbar" msgstr "" @@ -353,3 +349,11 @@ #: ../src/xpad-toolbar.c:548 msgid "_Move" msgstr "" + +#: ../xpad.desktop.in.h:1 +msgid "Jot down notes for later" +msgstr "Maak notas vir later" + +#: ../xpad.desktop.in.h:2 +msgid "Sticky Notes" +msgstr "Plaknotas (klewerig)" diff -Nru xpad-4.0/po/bg.po xpad-4.1/po/bg.po --- xpad-4.0/po/bg.po 2009-05-11 01:52:10.000000000 +0000 +++ xpad-4.1/po/bg.po 2011-11-15 17:17:05.000000000 +0000 @@ -8,31 +8,75 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad е графична програма. Стартирайте я от работната среда." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Не може да бъде отворена папка %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -40,61 +84,73 @@ "Тази папка е нужна, за да се запазят настройките и информацията за " "бележките. Xpad ще се затвори." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Показване на версията и изход" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Да не се създава нова бележка при стартиране, ако няма съществуващи такива" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Създаване на нова бележка при стартиране дори ако такива съществуват" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Създаване на нова бележка със съдържанието на файл" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "ФАЙЛ" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Затваряне на всички бележки" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Не може да бъде прочетен файл %s." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Изтриване на тази бележка?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Целият текст от бележката ще бъде безвъзвратно загубен." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Настройки на „%s“" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Лепкави бележки" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Явор Доганов \n" @@ -110,60 +166,60 @@ " Michael Terry https://launchpad.net/~mterry\n" " Yavor Doganov https://launchpad.net/~yavor" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Бележка" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Показване на _всички работни места" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Редактиране" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Изглед" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Лента с инструменти" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "_Автоматично скриване на лентата с инструменти" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "Лента за п_релистване" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Рамки на прозореца" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Бележки" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "Показване на _всички" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Затваряне на всички" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Помощ" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Ръководство" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Относно" @@ -287,6 +343,10 @@ msgid "Close All Pads" msgstr "Затваряне на всички бележки" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Добавяне на разделител към лентата с инструменти" @@ -306,59 +366,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Лепкави бележки" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/cs.po xpad-4.1/po/cs.po --- xpad-4.0/po/cs.po 2009-05-11 01:52:18.000000000 +0000 +++ xpad-4.1/po/cs.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,34 +6,23 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "Nemohu zapisovat do souboru %s: %s" -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" tomasjerabek https://launchpad.net/~tomasjerabek\n" -"\n" -"Launchpad Contributions:\n" -" Michael Terry https://launchpad.net/~mterry\n" -" tomasjerabek https://launchpad.net/~tomasjerabek" - #: ../src/help.c:49 msgid "" "Each xpad session consists of one or more open pads. These pads are " @@ -65,146 +54,161 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" #: ../src/help.c:73 msgid "Help" msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" tomasjerabek https://launchpad.net/~tomasjerabek\n" +"\n" +"Launchpad Contributions:\n" +" Michael Terry https://launchpad.net/~mterry\n" +" tomasjerabek https://launchpad.net/~tomasjerabek" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "" diff -Nru xpad-4.0/po/da.po xpad-4.1/po/da.po --- xpad-4.0/po/da.po 2009-05-11 01:52:07.000000000 +0000 +++ xpad-4.1/po/da.po 2011-11-15 17:17:05.000000000 +0000 @@ -4,35 +4,75 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + #: ../src/help.c:73 msgid "Help" msgstr "Hjlp" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad er et grafisk program som skal kres fra dit skrivebord." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Kunne ikke bne katalog %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -40,52 +80,73 @@ "Dette katalog er ndvendigt for at gemme indstillinger og information for " "noter. Xpad vil afslutte nu." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Vis versionsnummer og afslut" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Opret ikke en ny note ved opstart hvis ingen tidligere noter eksisterer" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Opret en ny note ved opstart, selvom noter allerede eksisterer" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 +msgid "Create a new pad with the contents of a file" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FIL" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Luk alle noter" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:154 +#, c-format +msgid "Could not read file %s." +msgstr "" + +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Slet denne note?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Al tekst p denne note vil blive tabt for altid." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Egenskaber for \"%s\"" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Selvklbende noter" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Morten Bo Johansen \n" @@ -99,60 +160,60 @@ " Morten Bo Johansen https://launchpad.net/~mojo-mbjnet\n" " Peter Skov https://launchpad.net/~a0peter" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Note" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Vis p _alle skriveborde" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Redigr" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Vis" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Vrktjslinje" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "_Autoskjul vrktjslinje" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Rullebjlke" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "Vindues_dekoration" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "N_oter" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "Vis _alle" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Luk alle" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Hjlp" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Indhold" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Om" @@ -276,6 +337,10 @@ msgid "Close All Pads" msgstr "Luk alle noter" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Fj en separator til vrktjslinje" @@ -295,64 +360,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Selvklbende noter" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-app.c:775 -msgid "Create a new pad with the contents of a file" -msgstr "" - -#: ../src/xpad-pad.c:155 -#, c-format -msgid "Could not read file %s." -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/de.po xpad-4.1/po/de.po --- xpad-4.0/po/de.po 2009-05-11 01:52:20.000000000 +0000 +++ xpad-4.1/po/de.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,18 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-05-07 03:45+0000\n" "Last-Translator: christian.hartmann \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "Datei konnte nicht gespeichert werden %s: %s" @@ -67,8 +68,7 @@ "möglich sind. Probier es auch und habe Spaß mit Xpad" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" "Fehlerberichte und Kommentare kannst Du an xpad-devel@lists.sourceforge.net " "schicken." @@ -77,21 +77,21 @@ msgid "Help" msgstr "Hilfe" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" "Xpad ist eine graphische Anwendung. Bitte starte sie nur auf deinem Desktop" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Verzeichnis %s konnte nicht geöffnet werden." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -99,128 +99,132 @@ "Dieses Verzeichnis wird benötigt, um Einstellungen und Zettelinformationen " "zu speichern. Xpad wird nun beendet." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Versionsnummer anzeigen und beenden" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Erstelle keinen neuen Zettel beim Start, auch wenn keine älteren existieren" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Erstelle einen neuen Zettel beim Start, auch wenn ältere existieren" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Verstecke alle Zettel" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Zeige alle Zettel" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Erstelle einen neuen Zettel mit dem Inhalt einer Datei" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "Datei" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Schließe alle Zettel" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Konnte Datei nicht lesen: %s" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Diesen Zettel löschen?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Der gesamte Text dieses Zettels geht verloren!" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "\"%s\" Eigenschaften" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Klebezettel" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" " christian.hartmann https://launchpad.net/~christian-hartmann-berlin" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Zettel" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Auf _Allen Arbeitsflächen anzeigen" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Ansicht" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Werkzeugleiste" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Werzeugleiste automatisch _verstecken" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Bildlaufleiste" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Fensterrahmen" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Notizen" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "Alle anzeigen" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "Alle schließen" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Hilfe" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Contents" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_About" diff -Nru xpad-4.0/po/en_GB.po xpad-4.1/po/en_GB.po --- xpad-4.0/po/en_GB.po 2009-05-11 01:52:11.000000000 +0000 +++ xpad-4.1/po/en_GB.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,31 +6,75 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: David Lodge \n" "Language-Team: English (British) \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad is a graphical program. Please run it from your desktop." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Could not open directory %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -38,60 +82,72 @@ "This directory is needed to store preference and pad information. Xpad will " "close now." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Show version number and quit" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "Don't create a new pad on startup if no previous pads exist" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Create a new pad on startup even if pads already exist" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Create a new pad with the contents of a file" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FILE" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Close all pads" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Could not read file %s." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Delete this pad?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "All text of this pad will be irrevocably lost." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "'%s' Properties" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Sticky notes" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "David Lodge \n" @@ -102,60 +158,60 @@ "Launchpad Contributions:\n" " David Lodge https://launchpad.net/~dave-cirt" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Pad" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Show on _All Workspaces" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Edit" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_View" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Toolbar" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "_Autohide Toolbar" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Scrollbar" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Window Decorations" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Notes" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Show All" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Close All" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Help" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Contents" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_About" @@ -279,6 +335,10 @@ msgid "Close All Pads" msgstr "Close All Pads" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Add a Se_parator to Toolbar" @@ -298,59 +358,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Sticky Notes" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/es.po xpad-4.1/po/es.po --- xpad-4.0/po/es.po 2009-05-11 01:52:08.000000000 +0000 +++ xpad-4.1/po/es.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,48 +6,77 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.0-b2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-02-05 17:39+0000\n" "Last-Translator: Paco Molinero \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "No se puede escribir en el archivo %s: %s" -#: ../src/help.c:62 +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." msgstr "" -"Por favor, envíe comentarios o informes de error a xpad-" -"devel@lists.sourceforge.net" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" +"Por favor, envíe comentarios o informes de error a xpad-devel@lists." +"sourceforge.net" #: ../src/help.c:73 msgid "Help" msgstr "Ayuda" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." -msgstr "" -"Xpad es un programa gráfico. Por favor ejecútelo desde el escritorio." +msgstr "Xpad es un programa gráfico. Por favor ejecútelo desde el escritorio." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "No se pudo abrir el directorio %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -56,40 +85,72 @@ "sobre\n" "las notas. Xpad se cerrará ahora." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Mostrar número de versión y salir" +#: ../src/xpad-app.c:768 +msgid "Don't create a new pad on startup if no previous pads exist" +msgstr "" + +#: ../src/xpad-app.c:774 +msgid "Create a new pad on startup even if pads already exist" +msgstr "" + #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 +msgid "Create a new pad with the contents of a file" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "ARCHIVO" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:779 +msgid "Close all pads" +msgstr "" + +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "No se puede leer el archivo %s." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "¿Borrar esta nota?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Todo el texto de esta nota se perderá irrevocablemente." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "%s Propiedades" +#: ../src/xpad-pad.c:1240 +msgid "Sticky notes" +msgstr "" + #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -102,56 +163,60 @@ " Paco Molinero https://launchpad.net/~franciscomol\n" " Ramón Rey Vicente https://launchpad.net/~ramon-rey" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Nota" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1509 +msgid "Show on _All Workspaces" +msgstr "" + +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Editar" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Ver" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "Barra de _herramientas" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "_Autoesconder barra de herramientas" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "Barras de _desplazamiento" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Decoraciones de la ventana" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Notas" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Mostrar todo" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "Cerrar todas" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Ayuda" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Contenidos" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Acerca de" @@ -207,6 +272,10 @@ msgid "_Edit lock" msgstr "_Bloquear edición" +#: ../src/xpad-preferences.c:180 +msgid "_Pads start on all workspaces" +msgstr "" + #: ../src/xpad-preferences.c:181 msgid "_Confirm pad deletion" msgstr "_Confirmar borrado de nota" @@ -271,6 +340,10 @@ msgid "Close All Pads" msgstr "Cerrar todas las notas" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Añadir un _Separador a la barra de herramientas" @@ -290,73 +363,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Notas pegajosas" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/xpad-app.c:766 -msgid "Don't create a new pad on startup if no previous pads exist" -msgstr "" - -#: ../src/xpad-app.c:772 -msgid "Create a new pad on startup even if pads already exist" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-app.c:775 -msgid "Create a new pad with the contents of a file" -msgstr "" - -#: ../src/xpad-app.c:776 -msgid "Close all pads" -msgstr "" - -#: ../src/xpad-pad.c:1233 -msgid "Sticky notes" -msgstr "" - -#: ../src/xpad-pad.c:1500 -msgid "Show on _All Workspaces" -msgstr "" - -#: ../src/xpad-preferences.c:180 -msgid "_Pads start on all workspaces" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/et.po xpad-4.1/po/et.po --- xpad-4.0/po/et.po 2009-05-11 01:52:16.000000000 +0000 +++ xpad-4.1/po/et.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,18 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-05-01 18:14+0000\n" "Last-Translator: Eraser \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -53,154 +54,157 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" #: ../src/help.c:73 msgid "Help" msgstr "Abiinfo" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Kausta %s avamine ebaõnnestu." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FAIL" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Faili %s lugemine ebaõnnestus." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "'%s' omadused" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" " Eraser https://launchpad.net/~rivozangov" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Muuda" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Vaata" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Tööriistariba" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Kerimisriba" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Näita kõiki" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Sulge kõik" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Abiinfo" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "S_isu" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "Tiitelin_fo" diff -Nru xpad-4.0/po/fi.po xpad-4.1/po/fi.po --- xpad-4.0/po/fi.po 2009-05-11 01:52:16.000000000 +0000 +++ xpad-4.1/po/fi.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,11 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,20 +20,63 @@ "X-Poedit-Country: FINLAND\n" "X-Poedit-Language: Finnish\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad on graafinen ohjelma. Aja sitä työpöydältä." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Ei voitu avata hakemistoa %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -40,63 +84,75 @@ "Tämä hakemisto tarvitaan tallentamaan ensisijaisuus- ja lapputietoja. Xpad " "sulkeutuu nyt." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Näytä versionumero ja poistu" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Älä luo uutta lappua käynnistyksen yhteydessä, jos aikaisempi lappu on jo " "olemassa" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" "Luo uusi lappu käynnistyksen yhteydessä myös silloin kun lappu on jo olemassa" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Luo uusi lappu tiedoston sisällöstä" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "TIEDOSTO" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Sulje kaikki laput" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Ei voitu lukea tiedostoa %s." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Poistetaanko tämä lappu?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Kaikki tämän lapun teksti menetetään peruuttomasti." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "”%s” Ominaisuudet" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Liimalappumuistiinpanot" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Jorma Karvonen \n" @@ -108,60 +164,60 @@ " Jorma Karvonen https://launchpad.net/~karvjorm-users\n" " Michael Terry https://launchpad.net/~mterry" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Lappu" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Näytä k_aikissa työtiloissa" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "M_uokkaa" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Näkymä" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Työkalupalkki" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Piil_ota automaattisesti työkalupalkki" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "Vi_erityspalkki" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Yläotsakkeet" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Muistiot" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Näytä kaikki" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Sulje kaikki" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "O_paste" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "S_isältö" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "Oh_jelmasta" @@ -285,6 +341,10 @@ msgid "Close All Pads" msgstr "Sulje kaikki laput" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Lisää _erotin työkalupalkkiin" @@ -304,59 +364,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Liimalappumuistiinpanot" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/fr.po xpad-4.1/po/fr.po --- xpad-4.0/po/fr.po 2009-05-11 01:52:19.000000000 +0000 +++ xpad-4.1/po/fr.po 2011-11-15 17:17:05.000000000 +0000 @@ -5,44 +5,79 @@ msgid "" msgstr "" "Project-Id-Version: GNU xpad 1.13\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-02-05 03:55+0000\n" "Last-Translator: Gabriel Filion \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/help.c:62 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -"SVP transmettre vos commentaires ou rapports d'anomalies xpad-" -"devel@lists.sourceforge.net" +"SVP transmettre vos commentaires ou rapports d'anomalies xpad-devel@lists." +"sourceforge.net" #: ../src/help.c:73 msgid "Help" msgstr "Aide" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" "Xpad ncessite une interface graphique. Veuillez excuter ce programme " "partir de votre bureau." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Ne peut ouvrir le rpertoire %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -50,64 +85,72 @@ "Ce rpertoire est ncessaire pour stocker les prfrences et les information " "du pad. Xpad va maintenant fermer." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Afficher la version et quitter" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "Ne pas crer de nouvelle note au dmarrage s'il en existe dj" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Crer une nouvelle note au dmarrage mme s'il en existe dj" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Cacher toutes les notes" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Afficher toutes les notes" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 +msgid "Create a new pad with the contents of a file" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FICHIER" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Fermer toutes les notes" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Impossible de lire le fichier %s" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Effacer cette note ?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Le texte de cette note sera irrvocablement perdu." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Proprits de '%s'" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Post-it" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -119,52 +162,60 @@ " Gabriel Filion https://launchpad.net/~gabriel-filion\n" " Michel Robitaille https://launchpad.net/~robitail" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Post-it" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "_Afficher sur tous les bureaux" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Edition" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Affichage" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Barre d'outils" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1548 +msgid "_Autohide Toolbar" +msgstr "" + +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "Barre de _dfilement" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1551 +msgid "_Window Decorations" +msgstr "" + +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Notes" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Tout afficher" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "Tout _fermer" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Aide" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Contenu" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_ propos" @@ -220,6 +271,14 @@ msgid "_Edit lock" msgstr "_diter le verrou" +#: ../src/xpad-preferences.c:180 +msgid "_Pads start on all workspaces" +msgstr "" + +#: ../src/xpad-preferences.c:181 +msgid "_Confirm pad deletion" +msgstr "" + #: ../src/xpad-preferences.c:187 msgid "Xpad Preferences" msgstr "Prfrences de Xpad" @@ -240,6 +299,10 @@ msgid "Close and Save Pad" msgstr "Fermer et sauvegarder le p" +#: ../src/xpad-toolbar.c:75 +msgid "Add _Close to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:76 msgid "Delete Pad" msgstr "Effacer le post-it" @@ -299,62 +362,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Notes autocollantes" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/xpad-app.c:775 -msgid "Create a new pad with the contents of a file" -msgstr "" - -#: ../src/xpad-pad.c:1529 -msgid "_Autohide Toolbar" -msgstr "" - -#: ../src/xpad-pad.c:1532 -msgid "_Window Decorations" -msgstr "" - -#: ../src/xpad-preferences.c:180 -msgid "_Pads start on all workspaces" -msgstr "" - -#: ../src/xpad-preferences.c:181 -msgid "_Confirm pad deletion" -msgstr "" - -#: ../src/xpad-toolbar.c:75 -msgid "Add _Close to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/ga.po xpad-4.1/po/ga.po --- xpad-4.0/po/ga.po 2009-05-11 01:52:13.000000000 +0000 +++ xpad-4.1/po/ga.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,31 +6,75 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Irish \n" +"Language: ga\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Is clr grafach Xpad. Rith do dheasc, le do thoil." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Norbh fhidir an chomhadlann %s a oscailt." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -38,61 +82,72 @@ "N folir don chomhadlann seo a bheith oscailte le haghaidh eolas faoi na " "ceapa agus do shainroghanna. Druidfidh Xpad anois." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Taispein an uimhir leagain agus scoir" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" -msgstr "" -"N cruthaigh ceap nua ag am tosaithe mura bhfuil ceap ann cheana fin" +msgstr "N cruthaigh ceap nua ag am tosaithe mura bhfuil ceap ann cheana fin" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Cruthaigh ceap nua ag am tosaithe fi m t ceapa ann cheana fin" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Cruthaigh ceap nua le hinneachar comhaid ann" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "COMHAD" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Dn gach ceap nta" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Norbh fhidir comhad %s a lamh." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Ar mhaith leat an ceap seo a scriosadh?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Scriosfaidh an tacs uile at sa cheap seo, gan fil ar ais." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "'%s' Aironna" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Nta greamaitheacha" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Kevin Scannell \n" @@ -104,61 +159,61 @@ " Kevin Patrick Scannell https://launchpad.net/~scannell\n" " Michael Terry https://launchpad.net/~mterry" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "Cea_p" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Taispein i n_Gach Sps Oibre" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Eagar" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Amharc" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Barra Uirlis" # coinage - KPS -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "_Uathfholaigh an barra uirlis" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Scrollbharra" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "Maisichin _Fuinneoga" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Nta" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Taispein an t-iomln" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Dn Gach Uile" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Cabhair" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Clr" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Faoi seo" @@ -282,6 +337,10 @@ msgid "Close All Pads" msgstr "Dn Gach Uile Cheap Nta" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Cuir _deighilteoir leis an Bharra Uirlis" @@ -301,59 +360,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Nta Greamaitheacha" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/hr.po xpad-4.1/po/hr.po --- xpad-4.0/po/hr.po 2009-05-11 01:52:18.000000000 +0000 +++ xpad-4.1/po/hr.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,18 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-02-15 18:41+0000\n" "Last-Translator: Stevo-88 \n" "Language-Team: Croatian \n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "Nije moguće pisati u datoteku %s: %s." @@ -66,105 +67,161 @@ "kliknete na blok desnom tipkom. Iskušajte i uživajte!" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -"Molimo Vas da komentare ili prijave grešaka šaljete na xpad-" -"devel@lists.sourceforge.net." +"Molimo Vas da komentare ili prijave grešaka šaljete na xpad-devel@lists." +"sourceforge.net." #: ../src/help.c:73 msgid "Help" msgstr "Pomoć" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" "Xpad je program s grafičkim sučeljem. Molim Vas, pokrenite ga iz desktopa." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:457 +#, c-format +msgid "Could not open directory %s." +msgstr "" + +#: ../src/xpad-app.c:460 +msgid "" +"This directory is needed to store preference and pad information. Xpad will " +"close now." +msgstr "" + +#: ../src/xpad-app.c:767 +msgid "Show version number and quit" +msgstr "" + +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Nemoj stvoriti novi blok pri pokretanju ako već ne postoje prijašnji blokovi." -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Stvori novi blok pri pokretanju čak i ako beć postoje blokovi." -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Sakrij sve blokove" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Prikaži sve blokove" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Stvori novi blok koji sadrži podatke iz datoteke." -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "DATOTEKA" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Zatvori sve blokove" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-app.c:810 +#, c-format +msgid "Xpad %s" +msgstr "" + +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Nije moguće čitati iz datoteke %s." -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:653 +msgid "Delete this pad?" +msgstr "" + +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Sav će tekst ovog bloka biti nepovratno izgubljen." -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:685 +#, c-format +msgid "'%s' Properties" +msgstr "" + +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Papirići" -#: ../src/xpad-pad.c:1508 +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Stevo-88 https://launchpad.net/~stevo-8888" + +#: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 +msgid "Show on _All Workspaces" +msgstr "" + +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Uređivanje" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Prikaz" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Alatna traka" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Automatski _sakrij alatnu traku" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1550 +msgid "_Scrollbar" +msgstr "" + +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Rubovi prozora" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1554 +msgid "_Notes" +msgstr "" + +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Prikaži sve" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Zatvori sve" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Pomoć" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Sadržaj" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_O programu" @@ -220,6 +277,10 @@ msgid "_Edit lock" msgstr "_Zabrani uređivanje" +#: ../src/xpad-preferences.c:180 +msgid "_Pads start on all workspaces" +msgstr "" + #: ../src/xpad-preferences.c:181 msgid "_Confirm pad deletion" msgstr "_Potvrdite brisanje bloka" @@ -300,67 +361,10 @@ msgid "_Move" msgstr "_Premjesti" -#: ../xpad.desktop.in.h:2 -msgid "Sticky Notes" -msgstr "Post-it papirići" - -#: ../src/xpad-app.c:455 -#, c-format -msgid "Could not open directory %s." -msgstr "" - -#: ../src/xpad-app.c:458 -msgid "" -"This directory is needed to store preference and pad information. Xpad will " -"close now." -msgstr "" - -#: ../src/xpad-app.c:765 -msgid "Show version number and quit" -msgstr "" - -#: ../src/xpad-app.c:807 -#, c-format -msgid "Xpad %s" -msgstr "" - -#: ../src/xpad-pad.c:649 -msgid "Delete this pad?" -msgstr "" - -#: ../src/xpad-pad.c:681 -#, c-format -msgid "'%s' Properties" -msgstr "" - -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Stevo-88 https://launchpad.net/~stevo-8888" - -#: ../src/xpad-pad.c:1491 -msgid "_Pad" -msgstr "" - -#: ../src/xpad-pad.c:1500 -msgid "Show on _All Workspaces" -msgstr "" - -#: ../src/xpad-pad.c:1531 -msgid "_Scrollbar" -msgstr "" - -#: ../src/xpad-pad.c:1535 -msgid "_Notes" -msgstr "" - -#: ../src/xpad-preferences.c:180 -msgid "_Pads start on all workspaces" -msgstr "" - #: ../xpad.desktop.in.h:1 msgid "Jot down notes for later" msgstr "" + +#: ../xpad.desktop.in.h:2 +msgid "Sticky Notes" +msgstr "Post-it papirići" diff -Nru xpad-4.0/po/hu.po xpad-4.1/po/hu.po --- xpad-4.0/po/hu.po 2009-05-11 01:52:14.000000000 +0000 +++ xpad-4.1/po/hu.po 2011-11-15 17:17:05.000000000 +0000 @@ -5,31 +5,75 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Az Xpad egy grafikus program. Krem futtassa az asztalrl!" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Nem tudom megnyitni a %s knyvtrat." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -37,61 +81,72 @@ "Ennek a knyvtrnak szksge van arra, hogy eltrolja a tulajdonsgokat s a " "jegyzet informciit. Az Xpad most bezrdik." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Verziszm megjelentse s kilps" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" -msgstr "" -"Ne hozzon ltre j jegyzetet indtskor ha az elzbl nem lptnk ki" +msgstr "Ne hozzon ltre j jegyzetet indtskor ha az elzbl nem lptnk ki" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Indtskor hozzon ltre j jegyzetet, akkor is, ha mr van" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "j jegyzet ksztse a fjl tartalmval" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FJL" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "sszes jegyzet bezrsa" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Nem tudom olvasni a %s fjlt." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Trljem ezt a jegyzetet?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Minden szveg visszavonhatatlanul elveszik a jegyzetrl." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "'%s' Tulajdonsgok" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Ragads jegyzetek" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Nmeth Csaba \n" @@ -104,60 +159,60 @@ " 1soproni https://launchpad.net/~csaba\n" " Gabor Kelemen https://launchpad.net/~kelemeng" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Jegyzet" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Mutassa az _sszes munkaterleten" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Szerkeszts" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Nzet" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Eszkztr" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "El_rejtd eszkztr" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Grgetsv" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Ablak dekorci" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Jegyzetek" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Mindet mutat" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "Mindet _bezr" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Sg" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Tartalom" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Nvjegy" @@ -281,6 +336,10 @@ msgid "Close All Pads" msgstr "sszes jegyzet bezrsa" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Elvlaszt hozzadsa az eszkztrhoz" @@ -300,59 +359,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Ragads jegyzetek" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/it.po xpad-4.1/po/it.po --- xpad-4.0/po/it.po 2009-05-11 01:52:10.000000000 +0000 +++ xpad-4.1/po/it.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,38 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad 1.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: none\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Michael Terry https://launchpad.net/~mterry\n" -"\n" -"Launchpad Contributions:\n" -" Michael Terry https://launchpad.net/~mterry\n" -" Michele Gastaldo https://launchpad.net/~poomerang" - -#: ../xpad.desktop.in.h:1 -msgid "Jot down notes for later" -msgstr "Prendi delle note per più tardi" - -#: ../xpad.desktop.in.h:2 -msgid "Sticky Notes" -msgstr "Note Adesive" - -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -73,146 +54,161 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" #: ../src/help.c:73 msgid "Help" msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Michael Terry https://launchpad.net/~mterry\n" +"\n" +"Launchpad Contributions:\n" +" Michael Terry https://launchpad.net/~mterry\n" +" Michele Gastaldo https://launchpad.net/~poomerang" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "" @@ -351,3 +347,11 @@ #: ../src/xpad-toolbar.c:548 msgid "_Move" msgstr "" + +#: ../xpad.desktop.in.h:1 +msgid "Jot down notes for later" +msgstr "Prendi delle note per più tardi" + +#: ../xpad.desktop.in.h:2 +msgid "Sticky Notes" +msgstr "Note Adesive" diff -Nru xpad-4.0/po/ja.po xpad-4.1/po/ja.po --- xpad-4.0/po/ja.po 2009-05-11 01:52:08.000000000 +0000 +++ xpad-4.1/po/ja.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,51 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-04-21 10:58+0000\n" "Last-Translator: a_mg \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/help.c:73 -msgid "Help" -msgstr "ヘルプ" - -#: ../src/xpad-app.c:775 -msgid "FILE" -msgstr "ファイル" - -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" saikobee https://launchpad.net/~psychobee90\n" -"\n" -"Launchpad Contributions:\n" -" a_mg https://launchpad.net/~a-mg\n" -" saikobee https://launchpad.net/~psychobee90" - -#: ../src/xpad-pad.c:1528 -msgid "_Toolbar" -msgstr "ツール・バー" - -#. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 -msgid "_Help" -msgstr "ヘルプ" - -#: ../src/xpad-pad.c:1556 -msgid "_About" -msgstr "アバウト" - -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -86,128 +54,164 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/help.c:73 +msgid "Help" +msgstr "ヘルプ" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:778 +msgid "FILE" +msgstr "ファイル" + +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" saikobee https://launchpad.net/~psychobee90\n" +"\n" +"Launchpad Contributions:\n" +" a_mg https://launchpad.net/~a-mg\n" +" saikobee https://launchpad.net/~psychobee90" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1547 +msgid "_Toolbar" +msgstr "ツール・バー" + +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" -#: ../src/xpad-pad.c:1555 +#. The rest of the notes menu will get set up in the prep function below +#: ../src/xpad-pad.c:1567 +msgid "_Help" +msgstr "ヘルプ" + +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" +#: ../src/xpad-pad.c:1575 +msgid "_About" +msgstr "アバウト" + #: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 msgid "Appearance" msgstr "" diff -Nru xpad-4.0/po/ko.po xpad-4.1/po/ko.po --- xpad-4.0/po/ko.po 2009-05-11 01:52:09.000000000 +0000 +++ xpad-4.1/po/ko.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,90 +6,148 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:23+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Korean \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad는 GUI 프로그램입니다. 그래픽 환경에서 동작시켜주세요." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "%s 디렉토리를 열수 없습니다." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." -msgstr "이 디렉토리에는 메모 내용과 Xpad 설정을 저장할수 있어야 합니다.Xpad를 종료합니다." +msgstr "" +"이 디렉토리에는 메모 내용과 Xpad 설정을 저장할수 있어야 합니다.Xpad를 종료합" +"니다." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "버전을 넘버를 보고 종료 합니다." -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "시작할때 예전 메모가 없다면 메모를 생성하지 않습니다." -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "메모를 생성하려는데 메모가 존재합니다." #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "파일의 내용을 이용하여 새로운 메모를 생성합니다." -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "파일" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "모든 메모를 닫습니다." -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "%s 파일을 읽을수 없습니다." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "메모를 지우시겠습니까?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "모든 메모내용을 복구 할수 없을것입니다." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "%s' 속성" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Sticky notes" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "KwangSub Lee \n" @@ -101,60 +159,60 @@ " KwangSub Lee https://launchpad.net/~chokori\n" " Michael Terry https://launchpad.net/~mterry" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "메모(_P)" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "모든 화면에서 보이기(_A)" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "고치기(_E)" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "보기(_V)" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "툴바(_T)" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "툴바 자동숨기기(_A)" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "스크롤바(_S)" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "메모 창 테두리 보이기(_W)" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "메모(_N)" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "모두 보여주기(_S)" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "모두 닫기(_C)" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "도움말(_H)" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Contents" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "대하여..(_A)" @@ -278,6 +336,10 @@ msgid "Close All Pads" msgstr "모든 메모 닫기" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "나누기 버튼을 툴바에 추가(_p)" @@ -290,66 +352,10 @@ msgid "_Move" msgstr "옮기기(_M)" -#: ../xpad.desktop.in.h:2 -msgid "Sticky Notes" -msgstr "Sticky Notes" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" - #: ../xpad.desktop.in.h:1 msgid "Jot down notes for later" msgstr "" + +#: ../xpad.desktop.in.h:2 +msgid "Sticky Notes" +msgstr "Sticky Notes" diff -Nru xpad-4.0/po/lv.po xpad-4.1/po/lv.po --- xpad-4.0/po/lv.po 2009-05-11 01:52:17.000000000 +0000 +++ xpad-4.1/po/lv.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,110 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:23+0000\n" "Last-Translator: jogijs \n" "Language-Team: Latvian \n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/help.c:73 -msgid "Help" -msgstr "_Palīdzība" - -#: ../src/xpad-app.c:129 -msgid "Xpad is a graphical program. Please run it from your desktop." -msgstr "Xpad paredzēts grafiskai videi. Palaidiet to no darba virsmas." - -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 -msgid "Xpad" -msgstr "Xpad" - -#: ../src/xpad-app.c:775 -msgid "FILE" -msgstr "FAILS" - -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" jogijs https://launchpad.net/~e-blumbergs\n" -"\n" -"Launchpad Contributions:\n" -" jogijs https://launchpad.net/~e-blumbergs" - -#: ../src/xpad-pad.c:1508 -msgid "_Edit" -msgstr "_Labot" - -#: ../src/xpad-pad.c:1521 -msgid "_View" -msgstr "_Skats" - -#: ../src/xpad-pad.c:1528 -msgid "_Toolbar" -msgstr "_Rīkjosla" - -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 -msgid "_Close All" -msgstr "_Aizvērt visus" - -#. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 -msgid "_Help" -msgstr "_Palīdzība" - -#: ../src/xpad-pad.c:1555 -msgid "_Contents" -msgstr "_Saturs" - -#: ../src/xpad-pad.c:1556 -msgid "_About" -msgstr "_Par" - -#: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 -msgid "Appearance" -msgstr "Izskats" - -#: ../src/xpad-pad-properties.c:171 ../src/xpad-preferences.c:160 -msgid "Background:" -msgstr "Fona krāsa:" - -#: ../src/xpad-pad-properties.c:179 ../src/xpad-preferences.c:168 -msgid "Foreground:" -msgstr "Priekšplāns:" - -#: ../src/xpad-pad-properties.c:199 ../src/xpad-preferences.c:192 -msgid "Set Foreground Color" -msgstr "Uzstādīt priekšplāna krāsu" - -#: ../src/xpad-pad-properties.c:200 ../src/xpad-preferences.c:193 -msgid "Set Background Color" -msgstr "Uzstādīt fona Krāsu" - -#: ../src/xpad-pad-properties.c:201 ../src/xpad-preferences.c:194 -msgid "Set Font" -msgstr "Uzstādīt Fontu" - -#: ../src/xpad-preferences.c:252 -msgid "Options" -msgstr "Iestatījumi" - -#: ../src/xpad-toolbar.c:548 -msgid "_Move" -msgstr "_Pārvietot" - -#: ../xpad.desktop.in.h:2 -msgid "Sticky Notes" -msgstr "Līmlapiņas" - -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -145,104 +54,167 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -#: ../src/xpad-app.c:455 +#: ../src/help.c:73 +msgid "Help" +msgstr "_Palīdzība" + +#: ../src/xpad-app.c:131 +msgid "Xpad is a graphical program. Please run it from your desktop." +msgstr "Xpad paredzēts grafiskai videi. Palaidiet to no darba virsmas." + +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 +msgid "Xpad" +msgstr "Xpad" + +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:778 +msgid "FILE" +msgstr "FAILS" + +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" jogijs https://launchpad.net/~e-blumbergs\n" +"\n" +"Launchpad Contributions:\n" +" jogijs https://launchpad.net/~e-blumbergs" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1517 +msgid "_Edit" +msgstr "_Labot" + +#: ../src/xpad-pad.c:1540 +msgid "_View" +msgstr "_Skats" + +#: ../src/xpad-pad.c:1547 +msgid "_Toolbar" +msgstr "_Rīkjosla" + +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 +msgid "_Close All" +msgstr "_Aizvērt visus" + +#. The rest of the notes menu will get set up in the prep function below +#: ../src/xpad-pad.c:1567 +msgid "_Help" +msgstr "_Palīdzība" + +#: ../src/xpad-pad.c:1574 +msgid "_Contents" +msgstr "_Saturs" + +#: ../src/xpad-pad.c:1575 +msgid "_About" +msgstr "_Par" + +#: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 +msgid "Appearance" +msgstr "Izskats" + #: ../src/xpad-pad-properties.c:160 msgid "Use font from xpad preferences" msgstr "" @@ -259,6 +231,26 @@ msgid "Use these colors:" msgstr "" +#: ../src/xpad-pad-properties.c:171 ../src/xpad-preferences.c:160 +msgid "Background:" +msgstr "Fona krāsa:" + +#: ../src/xpad-pad-properties.c:179 ../src/xpad-preferences.c:168 +msgid "Foreground:" +msgstr "Priekšplāns:" + +#: ../src/xpad-pad-properties.c:199 ../src/xpad-preferences.c:192 +msgid "Set Foreground Color" +msgstr "Uzstādīt priekšplāna krāsu" + +#: ../src/xpad-pad-properties.c:200 ../src/xpad-preferences.c:193 +msgid "Set Background Color" +msgstr "Uzstādīt fona Krāsu" + +#: ../src/xpad-pad-properties.c:201 ../src/xpad-preferences.c:194 +msgid "Set Font" +msgstr "Uzstādīt Fontu" + #: ../src/xpad-preferences.c:149 msgid "Use font from theme" msgstr "" @@ -283,6 +275,10 @@ msgid "Xpad Preferences" msgstr "" +#: ../src/xpad-preferences.c:252 +msgid "Options" +msgstr "Iestatījumi" + #: ../src/xpad-toolbar.c:74 msgid "Clear Pad Contents" msgstr "" @@ -347,6 +343,14 @@ msgid "_Remove From Toolbar" msgstr "" +#: ../src/xpad-toolbar.c:548 +msgid "_Move" +msgstr "_Pārvietot" + #: ../xpad.desktop.in.h:1 msgid "Jot down notes for later" msgstr "" + +#: ../xpad.desktop.in.h:2 +msgid "Sticky Notes" +msgstr "Līmlapiņas" diff -Nru xpad-4.0/po/Makefile.in.in xpad-4.1/po/Makefile.in.in --- xpad-4.0/po/Makefile.in.in 2009-05-11 12:29:47.000000000 +0000 +++ xpad-4.1/po/Makefile.in.in 2011-11-15 17:17:40.000000000 +0000 @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: +dvi info ctags tags CTAGS TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -Nru xpad-4.0/po/nl.po xpad-4.1/po/nl.po --- xpad-4.0/po/nl.po 2009-05-11 01:52:12.000000000 +0000 +++ xpad-4.1/po/nl.po 2011-11-15 17:17:05.000000000 +0000 @@ -7,95 +7,151 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad is een grafisch programma; draai het in een grafische omgeving." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Kan map %s niet openen." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" "Deze map is nodig om voorkeuren en memo's in op te slaan. Xpad sluit nu af." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Versienummer tonen en stoppen" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Bij starten geen nieuw memoblaadje aanmaken\n" " als er nog geen bestaat" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Bij starten altijd een nieuw blaadje aanmaken" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" "Een nieuw memo aanmaken met de inhoud van\n" " dit bestand" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "BESTAND" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Alle memo's opslaan en Xpad afsluiten" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Kan bestand %s niet lezen." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Dit memo verwijderen?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Alle tekst van dit memo zal onherstelbaar verloren gaan." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Eigenschappen van '%s'" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Memo's" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Benno Schulenberg \n" @@ -106,60 +162,60 @@ "Launchpad Contributions:\n" " Benno Schulenberg https://launchpad.net/~bennoschulenberg" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Memo" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "_Op alle werkbladen" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "Be_werken" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "Beel_d" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Werkbalk" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Werkbalk _auto-verbergen" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Schuifbalk" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Vensterranden" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Notities" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "Alle _weergeven" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "Alle _sluiten" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Hulp" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Inhoud" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "In_fo" @@ -283,6 +339,10 @@ msgid "Close All Pads" msgstr "Alle memo's opslaan en Xpad afsluiten" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "_Scheiding toevoegen aan werkbalk" @@ -302,59 +362,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Memo's" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/pt.po xpad-4.1/po/pt.po --- xpad-4.0/po/pt.po 2009-05-11 01:52:20.000000000 +0000 +++ xpad-4.1/po/pt.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,18 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-04-28 14:03+0000\n" "Last-Translator: Luis Rascão \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "Nao foi possivel escrever no ficheiro %s: %s" @@ -67,30 +68,29 @@ "se." #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -"Por favor envie comentários or relatórios de defeitos para xpad-" -"devel@lists.sourceforge.net" +"Por favor envie comentários or relatórios de defeitos para xpad-devel@lists." +"sourceforge.net" #: ../src/help.c:73 msgid "Help" msgstr "Ajuda" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad é um programa gráfico. Por favor execute-o do seu desktop." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Não foi possivel abrir a directoria %s" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -98,120 +98,132 @@ "Esta directoria é necessária para armazenar preferências e informação de " "painel. Xpad irá fechar agora." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Mostrar numero da versão e sair." -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Não criar um novo painel no arranque se não existia nenhum painel anteior." -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Criar um novo painel no arranque mesmo se já existiam paineis." -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Esconder todos os paineis." -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Mostrar todos os paineis." -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Criar um novo painel com o conteudo de um ficheiro." -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FICHEIRO" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Fechar todos os paineis." -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Não foi possivel ler o ficheiro %s" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Apagar este painel?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Todo o texto neste painel será perdido irrevogavelmente." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "'%s' Propriedades" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Notas colantes" -#: ../src/xpad-pad.c:1491 +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Luis Rascão https://launchpad.net/~lrascao" + +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Painel" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Mostrar em _Todas as áreas de trabalho" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Editar" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Ver" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Barra de Ferramentas" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "_Esconder automaticamente barra de ferramentas" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Barra de scroll" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Decorações de janela" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Notas" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Mostrar Tudo" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Fechar Todos" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Ajuda" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Conteúdo" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Sobre" @@ -358,11 +370,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Sticky Notes" - -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Luis Rascão https://launchpad.net/~lrascao" diff -Nru xpad-4.0/po/ro.po xpad-4.1/po/ro.po --- xpad-4.0/po/ro.po 2009-05-11 01:52:12.000000000 +0000 +++ xpad-4.1/po/ro.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,109 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad 1.13\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Romanian \n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" -"Trimitei comentarii sau rapoarte de bug la xpad-devel@lists.sourceforge.net" - -#: ../src/help.c:73 -msgid "Help" -msgstr "Ajutor" - -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 -msgid "Xpad" -msgstr "Xpad" - -#: ../src/xpad-app.c:455 -#, c-format -msgid "Could not open directory %s." -msgstr "Nu am putut deschide directorul %s." - -#: ../src/xpad-app.c:458 -msgid "" -"This directory is needed to store preference and pad information. Xpad will " -"close now." -msgstr "" -"Acest director este necesar pentru stocare preferine i informaii. Xpad " -"seva nchide acum." - -#: ../src/xpad-pad.c:649 -msgid "Delete this pad?" -msgstr "tergei acest pad?" - -#: ../src/xpad-pad.c:650 -msgid "All text of this pad will be irrevocably lost." -msgstr "Toate textele din acest pad vor fi pierdute irevocabil." - -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Eugen Hoanca https://launchpad.net/~eugenhoanca\n" -"\n" -"Launchpad Contributions:\n" -" Eugen Hoanca https://launchpad.net/~eugenhoanca\n" -" Michael Terry https://launchpad.net/~mterry" - -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 -msgid "_Show All" -msgstr "Afiare Toate(_Show All)" - -#: ../src/xpad-preferences.c:179 -msgid "_Edit lock" -msgstr "Blocare _Edit" - -#: ../src/xpad-preferences.c:252 -msgid "Options" -msgstr "Opiuni" - -#: ../src/xpad-toolbar.c:74 -msgid "Clear Pad Contents" -msgstr "terge Coninut pad" - -#: ../src/xpad-toolbar.c:75 -msgid "Close and Save Pad" -msgstr "nchide i Salveaz pad" - -#: ../src/xpad-toolbar.c:76 -msgid "Delete Pad" -msgstr "terge pad" - -#: ../src/xpad-toolbar.c:77 -msgid "Open New Pad" -msgstr "Deschide pad nou" - -#: ../src/xpad-toolbar.c:79 -msgid "Edit Pad Properties" -msgstr "Editeaz proprieti pad" - -#: ../src/xpad-toolbar.c:80 -msgid "Close All Pads" -msgstr "nchide toate pad-urile" - -#: ../xpad.desktop.in.h:1 -msgid "Jot down notes for later" -msgstr "Notie pentru mai trziu" - -#: ../xpad.desktop.in.h:2 -msgid "Sticky Notes" -msgstr "Note Lipicioase(sticky)" - -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -143,111 +53,165 @@ "right click on a pad. Try it out and enjoy." msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" +"Trimitei comentarii sau rapoarte de bug la xpad-devel@lists.sourceforge.net" + +#: ../src/help.c:73 +msgid "Help" +msgstr "Ajutor" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 +msgid "Xpad" +msgstr "Xpad" + +#: ../src/xpad-app.c:457 +#, c-format +msgid "Could not open directory %s." +msgstr "Nu am putut deschide directorul %s." + +#: ../src/xpad-app.c:460 +msgid "" +"This directory is needed to store preference and pad information. Xpad will " +"close now." +msgstr "" +"Acest director este necesar pentru stocare preferine i informaii. Xpad " +"seva nchide acum." + +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:653 +msgid "Delete this pad?" +msgstr "tergei acest pad?" + +#: ../src/xpad-pad.c:654 +msgid "All text of this pad will be irrevocably lost." +msgstr "Toate textele din acest pad vor fi pierdute irevocabil." + +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Eugen Hoanca https://launchpad.net/~eugenhoanca\n" +"\n" +"Launchpad Contributions:\n" +" Eugen Hoanca https://launchpad.net/~eugenhoanca\n" +" Michael Terry https://launchpad.net/~mterry" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 +msgid "_Show All" +msgstr "Afiare Toate(_Show All)" + +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "" @@ -299,6 +263,10 @@ msgid "Use colors from theme" msgstr "" +#: ../src/xpad-preferences.c:179 +msgid "_Edit lock" +msgstr "Blocare _Edit" + #: ../src/xpad-preferences.c:180 msgid "_Pads start on all workspaces" msgstr "" @@ -311,19 +279,39 @@ msgid "Xpad Preferences" msgstr "" +#: ../src/xpad-preferences.c:252 +msgid "Options" +msgstr "Opiuni" + +#: ../src/xpad-toolbar.c:74 +msgid "Clear Pad Contents" +msgstr "terge Coninut pad" + #: ../src/xpad-toolbar.c:74 msgid "Add C_lear to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:75 +msgid "Close and Save Pad" +msgstr "nchide i Salveaz pad" + +#: ../src/xpad-toolbar.c:75 msgid "Add _Close to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:76 +msgid "Delete Pad" +msgstr "terge pad" + +#: ../src/xpad-toolbar.c:76 msgid "Add _Delete to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:77 +msgid "Open New Pad" +msgstr "Deschide pad nou" + +#: ../src/xpad-toolbar.c:77 msgid "Add _New to Toolbar" msgstr "" @@ -336,10 +324,18 @@ msgstr "" #: ../src/xpad-toolbar.c:79 +msgid "Edit Pad Properties" +msgstr "Editeaz proprieti pad" + +#: ../src/xpad-toolbar.c:79 msgid "Add Proper_ties to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:80 +msgid "Close All Pads" +msgstr "nchide toate pad-urile" + +#: ../src/xpad-toolbar.c:80 msgid "Add Close _All to Toolbar" msgstr "" @@ -354,3 +350,11 @@ #: ../src/xpad-toolbar.c:548 msgid "_Move" msgstr "" + +#: ../xpad.desktop.in.h:1 +msgid "Jot down notes for later" +msgstr "Notie pentru mai trziu" + +#: ../xpad.desktop.in.h:2 +msgid "Sticky Notes" +msgstr "Note Lipicioase(sticky)" diff -Nru xpad-4.0/po/ru.po xpad-4.1/po/ru.po --- xpad-4.0/po/ru.po 2009-05-11 01:52:20.000000000 +0000 +++ xpad-4.1/po/ru.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,18 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad 1.10.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-04-09 13:04+0000\n" "Last-Translator: BasicXP \n" "Language-Team: RU \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "Не удается произвести запись в файл %s: %s" @@ -65,8 +66,7 @@ "панели. Пробуйте и наслаждайтесь." #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" "Пожалуйста, присылайте комментарии по адресу xpad-devel@lists.sourceforge.net" @@ -74,22 +74,22 @@ msgid "Help" msgstr "Помощь" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" "Xpad - это графическая программа. Пожалуйста, запускайте её с вашего " "рабочего стола." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Не удалось открыть каталог %s" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -97,68 +97,72 @@ "Эта директория необходима для сохранения настроек и содержимого стикеров. А " "сейчас Xpad будет закрыт." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Показать версию и выйти" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "Не создавать новый стикер на старте если их ещё нет" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Создать новый стикер на старте, даже если уже есть." -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Скрыть все стикеры" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Показать все стикеры" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Создать новый стикер с содержимым из файла" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "ФАЙЛ" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Закрыть все стикеры" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Не удалось прочитать файл %s" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Удалить этот стикер?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Все содержимое стикера будет безвозвратно потеряно" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Свойства '%s'" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Липкие записки" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -170,60 +174,60 @@ " BasicXP https://launchpad.net/~basicxp\n" " Rion https://launchpad.net/~rion4ik" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Стикер" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Показать на _всех рабочих столах" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Правка" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Вид" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Панель инструментов" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Автоскрытие панели инструментов" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "Полоса прокрутки" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "Рамка окна" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Заметки" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "Показать все" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Закрыть все" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Справка" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Содержание" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_О программе" diff -Nru xpad-4.0/po/rw.po xpad-4.1/po/rw.po --- xpad-4.0/po/rw.po 2009-05-11 01:52:15.000000000 +0000 +++ xpad-4.1/po/rw.po 2011-11-15 17:17:05.000000000 +0000 @@ -15,44 +15,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Kinyarwanda \n" +"Language: rw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#. Translators: please translate this as your own name and optionally email -#. like so: "Your Name " -#: ../src/xpad-pad.c:1252 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Steve Murphy https://launchpad.net/~murf\n" -"\n" -"Launchpad Contributions:\n" -" Michael Terry https://launchpad.net/~mterry\n" -" Steve Murphy https://launchpad.net/~murf" - -# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.12.text -#: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 -msgid "Appearance" -msgstr "Imigaragarire" - -#: ../src/xpad-pad-properties.c:171 ../src/xpad-preferences.c:160 -msgid "Background:" -msgstr "Mbuganyuma:" - -# basctl/source\basicide\moduldlg.src:RID_DLG_LIBS.RID_FL_OPTIONS.text -#: ../src/xpad-preferences.c:252 -msgid "Options" -msgstr "Amahitamo" - -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -88,149 +63,169 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" #: ../src/help.c:73 msgid "Help" msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" -#: ../src/xpad-pad.c:1491 -msgid "_Pad" +#. Translators: please translate this as your own name and optionally email +#. like so: "Your Name " +#: ../src/xpad-pad.c:1259 +msgid "translator-credits" msgstr "" +"Launchpad Contributions:\n" +" Steve Murphy https://launchpad.net/~murf\n" +"\n" +"Launchpad Contributions:\n" +" Michael Terry https://launchpad.net/~mterry\n" +" Steve Murphy https://launchpad.net/~murf" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "" +# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.12.text +#: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 +msgid "Appearance" +msgstr "Imigaragarire" + #: ../src/xpad-pad-properties.c:160 msgid "Use font from xpad preferences" msgstr "" @@ -247,6 +242,10 @@ msgid "Use these colors:" msgstr "" +#: ../src/xpad-pad-properties.c:171 ../src/xpad-preferences.c:160 +msgid "Background:" +msgstr "Mbuganyuma:" + #: ../src/xpad-pad-properties.c:179 ../src/xpad-preferences.c:168 msgid "Foreground:" msgstr "" @@ -287,6 +286,11 @@ msgid "Xpad Preferences" msgstr "" +# basctl/source\basicide\moduldlg.src:RID_DLG_LIBS.RID_FL_OPTIONS.text +#: ../src/xpad-preferences.c:252 +msgid "Options" +msgstr "Amahitamo" + #: ../src/xpad-toolbar.c:74 msgid "Clear Pad Contents" msgstr "" diff -Nru xpad-4.0/po/sv.po xpad-4.1/po/sv.po --- xpad-4.0/po/sv.po 2009-05-11 01:52:19.000000000 +0000 +++ xpad-4.1/po/sv.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,18 +6,19 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-04-20 20:05+0000\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "Kunde inte skriva till filen %s: %s" @@ -66,8 +67,7 @@ "högerklickar på ett block. Prova det och lycka till." #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" "Skicka kommentarer eller felrapporter till xpad-devel@lists.sourceforge.net" @@ -75,21 +75,21 @@ msgid "Help" msgstr "Hjälp" -#: ../src/xpad-app.c:129 +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" "Xpad är ett grafiskt program. Vänligen kör det från din skrivbordsmiljö." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Kunde inte öppna katalog %s." -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." @@ -97,69 +97,73 @@ "Denna katalog behövs för att lagra inställningar och blockinformation. Xpad " "kommer stängas nu." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Visa versionsnummer och avsluta" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" "Skapa inte ett nytt block vid uppstart om inga tidigare block existerar" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Skapa ett nytt block vid uppstart även om block redan existerar" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Dölj alla block" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Visa alla block" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Skapa ett nytt block med innehållet från en fil" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "FIL" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Stäng alla block" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Kunde inte läsa fil %s." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Ta bort detta block?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "All text i detta block kommer att förloras och kan inte återfås." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Egenskaper för'%s" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Klistriga anteckningar" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Daniel Nylander \n" @@ -170,60 +174,60 @@ "Launchpad Contributions:\n" " Daniel Nylander https://launchpad.net/~yeager" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Block" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "Visa på _alla arbetsytor" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Redigera" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Visa" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Verktygslist" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Göm verktygslist _automatiskt" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "_Rullist" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "_Fönsterdekorationer" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Anteckningar" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Visa alla" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "_Stäng alla" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "_Hjälp" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Innehåll" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Om" diff -Nru xpad-4.0/po/th.po xpad-4.1/po/th.po --- xpad-4.0/po/th.po 2009-05-11 01:52:15.000000000 +0000 +++ xpad-4.1/po/th.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,134 +6,23 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-20 09:28+0000\n" "Last-Translator: Tharawut Paripaiboon \n" "Language-Team: Thai \n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/fio.c:126 +#: ../src/fio.c:128 #, c-format msgid "Could not write to file %s: %s" msgstr "ไม่สามารถเขียนไฟล์ %s: %s" -#: ../src/help.c:73 -msgid "Help" -msgstr "วิธีใช้" - -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 -msgid "Xpad" -msgstr "Xpad" - -#: ../src/xpad-app.c:455 -#, c-format -msgid "Could not open directory %s." -msgstr "ไม่สามารถเปิดไดเรคทอรี่ %s" - -#: ../src/xpad-app.c:775 -msgid "FILE" -msgstr "ไฟล์" - -#: ../src/xpad-app.c:807 -#, c-format -msgid "Xpad %s" -msgstr "Xpad %s" - -#: ../src/xpad-pad.c:155 -#, c-format -msgid "Could not read file %s." -msgstr "ไม่สามารถอ่านไฟล์ %s" - -#: ../src/xpad-pad.c:1491 -msgid "_Pad" -msgstr "_Pad" - -#: ../src/xpad-pad.c:1508 -msgid "_Edit" -msgstr "แก้ไข" - -#: ../src/xpad-pad.c:1521 -msgid "_View" -msgstr "มุมมอง" - -#: ../src/xpad-pad.c:1528 -msgid "_Toolbar" -msgstr "แถบเครื่องมือ" - -#: ../src/xpad-pad.c:1529 -msgid "_Autohide Toolbar" -msgstr "ซ่อนแถบเครื่องมืออัตโนมัติ" - -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 -msgid "_Show All" -msgstr "แสดงทั้งหมด" - -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 -msgid "_Close All" -msgstr "ปิดทั้งหมด" - -#. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 -msgid "_Help" -msgstr "วิธีใช้" - -#: ../src/xpad-pad.c:1555 -msgid "_Contents" -msgstr "เนื้อหา" - -#: ../src/xpad-pad.c:1556 -msgid "_About" -msgstr "เกี่ยวกับ" - -#: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 -msgid "Appearance" -msgstr "รูปแบบ" - -#: ../src/xpad-pad-properties.c:161 ../src/xpad-preferences.c:150 -msgid "Use this font:" -msgstr "ใช้ฟอนต์นี้:" - -#: ../src/xpad-pad-properties.c:163 ../src/xpad-preferences.c:152 -msgid "Use these colors:" -msgstr "ใช้สีนี้:" - -#: ../src/xpad-pad-properties.c:171 ../src/xpad-preferences.c:160 -msgid "Background:" -msgstr "พื้นหลัง:" - -#: ../src/xpad-pad-properties.c:179 ../src/xpad-preferences.c:168 -msgid "Foreground:" -msgstr "พื้นหน้า:" - -#: ../src/xpad-pad-properties.c:199 ../src/xpad-preferences.c:192 -msgid "Set Foreground Color" -msgstr "เลือกสีพื้นหน้า" - -#: ../src/xpad-pad-properties.c:200 ../src/xpad-preferences.c:193 -msgid "Set Background Color" -msgstr "เลือกสีพื้นหลัง" - -#: ../src/xpad-pad-properties.c:201 ../src/xpad-preferences.c:194 -msgid "Set Font" -msgstr "เลือกฟอนต์" - -#: ../src/xpad-preferences.c:149 -msgid "Use font from theme" -msgstr "ใช้ฟอนต์จากธีม" - -#: ../src/xpad-preferences.c:151 -msgid "Use colors from theme" -msgstr "ใช้สีจากธีม" - -#: ../src/xpad-preferences.c:252 -msgid "Options" -msgstr "ตัวเลือก" - #: ../src/help.c:49 msgid "" "Each xpad session consists of one or more open pads. These pads are " @@ -165,97 +54,208 @@ msgstr "" #: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" msgstr "" -#: ../src/xpad-app.c:129 +#: ../src/help.c:73 +msgid "Help" +msgstr "วิธีใช้" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 +msgid "Xpad" +msgstr "Xpad" + +#: ../src/xpad-app.c:457 +#, c-format +msgid "Could not open directory %s." +msgstr "ไม่สามารถเปิดไดเรคทอรี่ %s" + +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:778 +msgid "FILE" +msgstr "ไฟล์" + +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-app.c:810 +#, c-format +msgid "Xpad %s" +msgstr "Xpad %s" + +#: ../src/xpad-pad.c:154 +#, c-format +msgid "Could not read file %s." +msgstr "ไม่สามารถอ่านไฟล์ %s" + +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" " Tharawut Paripaiboon https://launchpad.net/~xcession" #: ../src/xpad-pad.c:1500 +msgid "_Pad" +msgstr "_Pad" + +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1517 +msgid "_Edit" +msgstr "แก้ไข" + +#: ../src/xpad-pad.c:1540 +msgid "_View" +msgstr "มุมมอง" + +#: ../src/xpad-pad.c:1547 +msgid "_Toolbar" +msgstr "แถบเครื่องมือ" + +#: ../src/xpad-pad.c:1548 +msgid "_Autohide Toolbar" +msgstr "ซ่อนแถบเครื่องมืออัตโนมัติ" + +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 +msgid "_Show All" +msgstr "แสดงทั้งหมด" + +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 +msgid "_Close All" +msgstr "ปิดทั้งหมด" + +#. The rest of the notes menu will get set up in the prep function below +#: ../src/xpad-pad.c:1567 +msgid "_Help" +msgstr "วิธีใช้" + +#: ../src/xpad-pad.c:1574 +msgid "_Contents" +msgstr "เนื้อหา" + +#: ../src/xpad-pad.c:1575 +msgid "_About" +msgstr "เกี่ยวกับ" + +#: ../src/xpad-pad-properties.c:132 ../src/xpad-preferences.c:122 +msgid "Appearance" +msgstr "รูปแบบ" + #: ../src/xpad-pad-properties.c:160 msgid "Use font from xpad preferences" msgstr "" +#: ../src/xpad-pad-properties.c:161 ../src/xpad-preferences.c:150 +msgid "Use this font:" +msgstr "ใช้ฟอนต์นี้:" + #: ../src/xpad-pad-properties.c:162 msgid "Use colors from xpad preferences" msgstr "" +#: ../src/xpad-pad-properties.c:163 ../src/xpad-preferences.c:152 +msgid "Use these colors:" +msgstr "ใช้สีนี้:" + +#: ../src/xpad-pad-properties.c:171 ../src/xpad-preferences.c:160 +msgid "Background:" +msgstr "พื้นหลัง:" + +#: ../src/xpad-pad-properties.c:179 ../src/xpad-preferences.c:168 +msgid "Foreground:" +msgstr "พื้นหน้า:" + +#: ../src/xpad-pad-properties.c:199 ../src/xpad-preferences.c:192 +msgid "Set Foreground Color" +msgstr "เลือกสีพื้นหน้า" + +#: ../src/xpad-pad-properties.c:200 ../src/xpad-preferences.c:193 +msgid "Set Background Color" +msgstr "เลือกสีพื้นหลัง" + +#: ../src/xpad-pad-properties.c:201 ../src/xpad-preferences.c:194 +msgid "Set Font" +msgstr "เลือกฟอนต์" + +#: ../src/xpad-preferences.c:149 +msgid "Use font from theme" +msgstr "ใช้ฟอนต์จากธีม" + +#: ../src/xpad-preferences.c:151 +msgid "Use colors from theme" +msgstr "ใช้สีจากธีม" + #: ../src/xpad-preferences.c:179 msgid "_Edit lock" msgstr "" @@ -272,6 +272,10 @@ msgid "Xpad Preferences" msgstr "" +#: ../src/xpad-preferences.c:252 +msgid "Options" +msgstr "ตัวเลือก" + #: ../src/xpad-toolbar.c:74 msgid "Clear Pad Contents" msgstr "" diff -Nru xpad-4.0/po/tr.po xpad-4.1/po/tr.po --- xpad-4.0/po/tr.po 2009-05-11 01:52:17.000000000 +0000 +++ xpad-4.1/po/tr.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,17 +6,23 @@ msgid "" msgstr "" "Project-Id-Version: xpad\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-02-14 01:18+0000\n" "Last-Translator: nfortech \n" "Language-Team: Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + #: ../src/help.c:49 msgid "" "Each xpad session consists of one or more open pads. These pads are " @@ -26,6 +32,18 @@ "temel olarak masaüstünüze duran bazı hatırlatmalar yazabileceğiniz, yapışkan " "notlardan oluşur." +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + #: ../src/help.c:57 msgid "" "To change color settings, right click on a pad and choose Edit-" @@ -40,184 +58,158 @@ "right click on a pad. Try it out and enjoy." msgstr "Birçok eylem" -#: ../src/xpad-app.c:765 +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 +msgid "Xpad is a graphical program. Please run it from your desktop." +msgstr "" + +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 +msgid "Xpad" +msgstr "" + +#: ../src/xpad-app.c:457 +#, c-format +msgid "Could not open directory %s." +msgstr "" + +#: ../src/xpad-app.c:460 +msgid "" +"This directory is needed to store preference and pad information. Xpad will " +"close now." +msgstr "" + +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Sürümü göster ve çık" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "Daha önceden bir bloknot varsa yeni bir bloknot yaratma" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Daha önceden bloknot olsa bile yeni bir bloknot yarat" -#: ../src/xpad-app.c:773 +#: ../src/xpad-app.c:775 msgid "Hide all pads" msgstr "Tüm bloknotları sakla" -#: ../src/xpad-app.c:774 +#: ../src/xpad-app.c:776 msgid "Show all pads" msgstr "Tüm bloknotları göster" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Bir Dosya içeriğiyle yeni bir bloknot oluştur." -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "DOSYA" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Tüm bloknotları kapat" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "%s dosyası okunamadı." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "bloknot silinsin mi?" -#: ../src/xpad-pad.c:1233 -msgid "Sticky notes" -msgstr "Yapışkan notlar" - -#: ../src/xpad-pad.c:1508 -msgid "_Edit" -msgstr "_Düzenle" - -#: ../src/xpad-toolbar.c:78 -msgid "Edit Preferences" -msgstr "Tercihleri düzenle" - -#: ../src/xpad-toolbar.c:79 -msgid "Edit Pad Properties" -msgstr "Bloknot özelliklerini düzenle" - -#: ../src/xpad-toolbar.c:80 -msgid "Close All Pads" -msgstr "Tüm bloknotları kapat" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:129 -msgid "Xpad is a graphical program. Please run it from your desktop." -msgstr "" - -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 -msgid "Xpad" -msgstr "" - -#: ../src/xpad-app.c:455 -#, c-format -msgid "Could not open directory %s." -msgstr "" - -#: ../src/xpad-app.c:458 -msgid "" -"This directory is needed to store preference and pad information. Xpad will " -"close now." -msgstr "" - -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "" +#: ../src/xpad-pad.c:1240 +msgid "Sticky notes" +msgstr "Yapışkan notlar" + #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" " nfortech https://launchpad.net/~fevzisumer" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1517 +msgid "_Edit" +msgstr "_Düzenle" + +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "" @@ -322,14 +314,26 @@ msgstr "" #: ../src/xpad-toolbar.c:78 +msgid "Edit Preferences" +msgstr "Tercihleri düzenle" + +#: ../src/xpad-toolbar.c:78 msgid "Add Pr_eferences to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:79 +msgid "Edit Pad Properties" +msgstr "Bloknot özelliklerini düzenle" + +#: ../src/xpad-toolbar.c:79 msgid "Add Proper_ties to Toolbar" msgstr "" #: ../src/xpad-toolbar.c:80 +msgid "Close All Pads" +msgstr "Tüm bloknotları kapat" + +#: ../src/xpad-toolbar.c:80 msgid "Add Close _All to Toolbar" msgstr "" diff -Nru xpad-4.0/po/vi.po xpad-4.1/po/vi.po --- xpad-4.0/po/vi.po 2009-05-11 01:52:15.000000000 +0000 +++ xpad-4.1/po/vi.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,91 +6,146 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 -msgid "Xpad is a graphical program. Please run it from your desktop." +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." msgstr "" -"Xpad là một chương trình đồ hoạ. Hãy chạy nó từ màn hình nền của bạn." -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 +msgid "Xpad is a graphical program. Please run it from your desktop." +msgstr "Xpad là một chương trình đồ hoạ. Hãy chạy nó từ màn hình nền của bạn." + +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "Không mở được thư mục %s" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "Cần thư mục này để lưu tùy thích và dữ liệu. Xpad sẽ thoát bây giờ." -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "Hiển thị phiên bản rồi thoát" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "Không tạo trang mới khi khởi động nếu chưa có trang nào." -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "Tạo một trang mới khi khởi động, ngay cả khi đã có trang cũ." #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "Tạo một trang mới với nội dung của một tập tin" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "TẬP TIN" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "Đóng mọi trang" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "Không đọc được tập tin %s." -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "Xoá bỏ trang này?" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "Tất cả nội dung của trang này sẽ bị mất hoàn toàn." -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "Tài sản « %s »" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "Ghi chép bám dính" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "Clytie Siddall \n" @@ -102,60 +157,60 @@ "Launchpad Contributions:\n" " Clytie Siddall https://launchpad.net/~clytie" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "_Trang" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "_Hiện trên mọi vùng làm việc" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "_Sửa đổi" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "_Xem" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "_Thanh công cụ" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "Tự động ẩn t_hanh công cụ" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "Thanh _cuộn" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "T_rang trí cửa sổ" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "_Ghi chú" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "_Hiện tất cả" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "Đó_ng tất cả" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "Trợ _giúp" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "_Nội dung" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "_Giới thiệu" @@ -279,6 +334,10 @@ msgid "Close All Pads" msgstr "Đóng mọi trang" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "Thêm một vạch _ngăn cách vào thanh công cụ" @@ -298,59 +357,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "Ghi chép bám dính" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/xpad.pot xpad-4.1/po/xpad.pot --- xpad-4.0/po/xpad.pot 2009-05-11 12:32:02.000000000 +0000 +++ xpad-4.1/po/xpad.pot 2011-11-15 17:17:56.000000000 +0000 @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-05-11 08:32-0400\n" +"POT-Creation-Date: 2011-11-15 12:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/fio.c:126 +#: ../src/fio.c:129 #, c-format msgid "Could not write to file %s: %s" msgstr "" @@ -119,20 +120,20 @@ msgid "Xpad %s" msgstr "" -#: ../src/xpad-pad.c:156 +#: ../src/xpad-pad.c:157 #, c-format msgid "Could not read file %s." msgstr "" -#: ../src/xpad-pad.c:659 +#: ../src/xpad-pad.c:656 msgid "Delete this pad?" msgstr "" -#: ../src/xpad-pad.c:660 +#: ../src/xpad-pad.c:657 msgid "All text of this pad will be irrevocably lost." msgstr "" -#: ../src/xpad-pad.c:691 +#: ../src/xpad-pad.c:688 #, c-format msgid "'%s' Properties" msgstr "" @@ -147,60 +148,60 @@ msgid "translator-credits" msgstr "" -#: ../src/xpad-pad.c:1501 +#: ../src/xpad-pad.c:1503 msgid "_Pad" msgstr "" -#: ../src/xpad-pad.c:1510 +#: ../src/xpad-pad.c:1512 msgid "Show on _All Workspaces" msgstr "" -#: ../src/xpad-pad.c:1518 +#: ../src/xpad-pad.c:1520 msgid "_Edit" msgstr "" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1543 msgid "_View" msgstr "" -#: ../src/xpad-pad.c:1538 +#: ../src/xpad-pad.c:1550 msgid "_Toolbar" msgstr "" -#: ../src/xpad-pad.c:1539 +#: ../src/xpad-pad.c:1551 msgid "_Autohide Toolbar" msgstr "" -#: ../src/xpad-pad.c:1541 +#: ../src/xpad-pad.c:1553 msgid "_Scrollbar" msgstr "" -#: ../src/xpad-pad.c:1542 +#: ../src/xpad-pad.c:1554 msgid "_Window Decorations" msgstr "" -#: ../src/xpad-pad.c:1545 +#: ../src/xpad-pad.c:1557 msgid "_Notes" msgstr "" -#: ../src/xpad-pad.c:1553 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1565 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "" -#: ../src/xpad-pad.c:1554 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1566 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1558 +#: ../src/xpad-pad.c:1570 msgid "_Help" msgstr "" -#: ../src/xpad-pad.c:1565 +#: ../src/xpad-pad.c:1577 msgid "_Contents" msgstr "" -#: ../src/xpad-pad.c:1566 +#: ../src/xpad-pad.c:1578 msgid "_About" msgstr "" diff -Nru xpad-4.0/po/zh_CN.po xpad-4.1/po/zh_CN.po --- xpad-4.0/po/zh_CN.po 2009-05-11 01:52:09.000000000 +0000 +++ xpad-4.1/po/zh_CN.po 2011-11-15 17:17:05.000000000 +0000 @@ -6,91 +6,147 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" -"Language-Team: Chinese (simplified) \n" +"Language-Team: Chinese (simplified) \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad 是一个图形化程序。请从您的桌面上运行它。" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "无法打开目录 %s" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "需要此目录以存储首选项和便笺信息。Xpad 现在将关闭。" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "显示版本号然后退出" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "即使不存在，启动时也不新建便笺" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "即使已经存在，启动时也新建一个便笺" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "从文件创建一个新便签" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "文件" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "关闭所有便笺" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "无法读入文件 %s。" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "删除此便笺？" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "此便笺中的所有文本将不可恢复地丢失。" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "‘%s’属性" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "自粘性备注" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "孟杰 \n" @@ -102,60 +158,60 @@ " Meng Jie https://launchpad.net/~zuxy-meng\n" " Michael Terry https://launchpad.net/~mterry" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "便笺(_P)" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "显示于所有工作区中(_A)" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "编辑(_E)" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "查看(_V)" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "工具栏(_T)" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "自动隐藏工具栏(_A)" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "滚动条(_S)" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "窗口装饰(_W)" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "备注(_N)" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "全部显示(_S)" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "全部关闭(_C)" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "帮助(_H)" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "内容(_C)" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "关于(_A)" @@ -279,6 +335,10 @@ msgid "Close All Pads" msgstr "关闭所有便笺" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "将分隔线添加至工具栏(_P)" @@ -298,59 +358,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "自粘性备注" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/po/zh_TW.po xpad-4.1/po/zh_TW.po --- xpad-4.0/po/zh_TW.po 2009-05-11 01:52:12.000000000 +0000 +++ xpad-4.1/po/zh_TW.po 2011-11-15 17:17:05.000000000 +0000 @@ -5,90 +5,146 @@ msgid "" msgstr "" "Project-Id-Version: xpad 2.11\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-11 11:35-0500\n" +"Report-Msgid-Bugs-To: xpad-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2011-11-14 11:41-0500\n" "PO-Revision-Date: 2009-01-11 17:24+0000\n" "Last-Translator: Michael Terry \n" "Language-Team: Chinese (traditional) \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-05-11 01:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../src/xpad-app.c:129 +#: ../src/fio.c:128 +#, c-format +msgid "Could not write to file %s: %s" +msgstr "" + +#: ../src/help.c:49 +msgid "" +"Each xpad session consists of one or more open pads. These pads are " +"basically sticky notes on your desktop in which you can write memos." +msgstr "" + +#: ../src/help.c:52 +msgid "" +"To move a pad, left drag on the toolbar, right drag on the resizer in " +"the bottom right, or hold down CTRL while left dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:55 +msgid "" +"To resize a pad, left drag on the resizer or hold down CTRL while " +"right dragging anywhere on the pad." +msgstr "" + +#: ../src/help.c:57 +msgid "" +"To change color settings, right click on a pad and choose Edit-" +">Preferences." +msgstr "" + +#: ../src/help.c:59 +msgid "" +"Most actions are available throught the popup menu that appears when you " +"right click on a pad. Try it out and enjoy." +msgstr "" + +#: ../src/help.c:62 +msgid "Please send comments or bug reports to xpad-devel@lists.sourceforge.net" +msgstr "" + +#: ../src/help.c:73 +msgid "Help" +msgstr "" + +#: ../src/xpad-app.c:131 msgid "Xpad is a graphical program. Please run it from your desktop." msgstr "Xpad 是圖形介面程式。請從您的桌面來執行它。" -#: ../src/xpad-app.c:134 ../xpad.desktop.in.h:3 +#: ../src/xpad-app.c:136 ../xpad.desktop.in.h:3 msgid "Xpad" msgstr "Xpad" -#: ../src/xpad-app.c:455 +#: ../src/xpad-app.c:457 #, c-format msgid "Could not open directory %s." msgstr "無法開啟字典 %s。" -#: ../src/xpad-app.c:458 +#: ../src/xpad-app.c:460 msgid "" "This directory is needed to store preference and pad information. Xpad will " "close now." msgstr "需要此目錄以儲存偏好設定與便條資訊。Xpad 現在將會關閉。" -#: ../src/xpad-app.c:765 +#: ../src/xpad-app.c:767 msgid "Show version number and quit" msgstr "顯示版本號碼並離開" -#: ../src/xpad-app.c:766 +#: ../src/xpad-app.c:768 msgid "Don't create a new pad on startup if no previous pads exist" msgstr "如果不存在已有的便條，啟動時就不要建立新的便條" -#: ../src/xpad-app.c:772 +#: ../src/xpad-app.c:774 msgid "Create a new pad on startup even if pads already exist" msgstr "即使已經存在便條，啟動時也要建立新便條" #: ../src/xpad-app.c:775 +msgid "Hide all pads" +msgstr "" + +#: ../src/xpad-app.c:776 +msgid "Show all pads" +msgstr "" + +#: ../src/xpad-app.c:777 +msgid "Toggle between show and hide all pads" +msgstr "" + +#: ../src/xpad-app.c:778 msgid "Create a new pad with the contents of a file" msgstr "以某個檔案的內容來建立新便條" -#: ../src/xpad-app.c:775 +#: ../src/xpad-app.c:778 msgid "FILE" msgstr "檔案" -#: ../src/xpad-app.c:776 +#: ../src/xpad-app.c:779 msgid "Close all pads" msgstr "關閉所有便條" -#: ../src/xpad-app.c:807 +#: ../src/xpad-app.c:810 #, c-format msgid "Xpad %s" msgstr "Xpad %s" -#: ../src/xpad-pad.c:155 +#: ../src/xpad-pad.c:154 #, c-format msgid "Could not read file %s." msgstr "無法讀取檔案 %s。" -#: ../src/xpad-pad.c:649 +#: ../src/xpad-pad.c:653 msgid "Delete this pad?" msgstr "刪除該便條" -#: ../src/xpad-pad.c:650 +#: ../src/xpad-pad.c:654 msgid "All text of this pad will be irrevocably lost." msgstr "該便條所有文字將會永久消失。" -#: ../src/xpad-pad.c:681 +#: ../src/xpad-pad.c:685 #, c-format msgid "'%s' Properties" msgstr "'%s' 的屬性" -#: ../src/xpad-pad.c:1233 +#: ../src/xpad-pad.c:1240 msgid "Sticky notes" msgstr "自粘性便條" #. Translators: please translate this as your own name and optionally email #. like so: "Your Name " -#: ../src/xpad-pad.c:1252 +#: ../src/xpad-pad.c:1259 msgid "translator-credits" msgstr "" "趙惟倫 \n" @@ -100,60 +156,60 @@ " Michael Terry https://launchpad.net/~mterry\n" " Wei-Lun Chao https://launchpad.net/~chaoweilun-pcmail" -#: ../src/xpad-pad.c:1491 +#: ../src/xpad-pad.c:1500 msgid "_Pad" msgstr "便條(_P)" -#: ../src/xpad-pad.c:1500 +#: ../src/xpad-pad.c:1509 msgid "Show on _All Workspaces" msgstr "顯示於所有工作區中(_A)" -#: ../src/xpad-pad.c:1508 +#: ../src/xpad-pad.c:1517 msgid "_Edit" msgstr "編輯(_E)" -#: ../src/xpad-pad.c:1521 +#: ../src/xpad-pad.c:1540 msgid "_View" msgstr "顯示(_V)" -#: ../src/xpad-pad.c:1528 +#: ../src/xpad-pad.c:1547 msgid "_Toolbar" msgstr "工具列(_T)" -#: ../src/xpad-pad.c:1529 +#: ../src/xpad-pad.c:1548 msgid "_Autohide Toolbar" msgstr "自動隱藏工具列(_A)" -#: ../src/xpad-pad.c:1531 +#: ../src/xpad-pad.c:1550 msgid "_Scrollbar" msgstr "捲動列(_S)" -#: ../src/xpad-pad.c:1532 +#: ../src/xpad-pad.c:1551 msgid "_Window Decorations" msgstr "視窗裝飾(_W)" -#: ../src/xpad-pad.c:1535 +#: ../src/xpad-pad.c:1554 msgid "_Notes" msgstr "備忘(_N)" -#: ../src/xpad-pad.c:1543 ../src/xpad-tray.c:123 +#: ../src/xpad-pad.c:1562 ../src/xpad-tray.c:123 msgid "_Show All" msgstr "全部顯示(_S)" -#: ../src/xpad-pad.c:1544 ../src/xpad-tray.c:130 +#: ../src/xpad-pad.c:1563 ../src/xpad-tray.c:130 msgid "_Close All" msgstr "全部關閉(_C)" #. The rest of the notes menu will get set up in the prep function below -#: ../src/xpad-pad.c:1548 +#: ../src/xpad-pad.c:1567 msgid "_Help" msgstr "求助(_H)" -#: ../src/xpad-pad.c:1555 +#: ../src/xpad-pad.c:1574 msgid "_Contents" msgstr "內容(_C)" -#: ../src/xpad-pad.c:1556 +#: ../src/xpad-pad.c:1575 msgid "_About" msgstr "關於(_A)" @@ -277,6 +333,10 @@ msgid "Close All Pads" msgstr "關閉全部便條" +#: ../src/xpad-toolbar.c:80 +msgid "Add Close _All to Toolbar" +msgstr "" + #: ../src/xpad-toolbar.c:81 msgid "Add a Se_parator to Toolbar" msgstr "加入分隔線到工具列(_P)" @@ -296,59 +356,3 @@ #: ../xpad.desktop.in.h:2 msgid "Sticky Notes" msgstr "自粘性便條" - -#: ../src/fio.c:126 -#, c-format -msgid "Could not write to file %s: %s" -msgstr "" - -#: ../src/help.c:49 -msgid "" -"Each xpad session consists of one or more open pads. These pads are " -"basically sticky notes on your desktop in which you can write memos." -msgstr "" - -#: ../src/help.c:52 -msgid "" -"To move a pad, left drag on the toolbar, right drag on the resizer in " -"the bottom right, or hold down CTRL while left dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:55 -msgid "" -"To resize a pad, left drag on the resizer or hold down CTRL while " -"right dragging anywhere on the pad." -msgstr "" - -#: ../src/help.c:57 -msgid "" -"To change color settings, right click on a pad and choose Edit-" -">Preferences." -msgstr "" - -#: ../src/help.c:59 -msgid "" -"Most actions are available throught the popup menu that appears when you " -"right click on a pad. Try it out and enjoy." -msgstr "" - -#: ../src/help.c:62 -msgid "" -"Please send comments or bug reports to xpad-devel@lists.sourceforge.net" -msgstr "" - -#: ../src/help.c:73 -msgid "Help" -msgstr "" - -#: ../src/xpad-app.c:773 -msgid "Hide all pads" -msgstr "" - -#: ../src/xpad-app.c:774 -msgid "Show all pads" -msgstr "" - -#: ../src/xpad-toolbar.c:80 -msgid "Add Close _All to Toolbar" -msgstr "" diff -Nru xpad-4.0/src/fio.c xpad-4.1/src/fio.c --- xpad-4.0/src/fio.c 2008-09-28 01:44:10.000000000 +0000 +++ xpad-4.1/src/fio.c 2011-11-15 17:17:05.000000000 +0000 @@ -1,6 +1,7 @@ /* Copyright (c) 2001-2007 Michael Terry +Copytight (c) 2011 David Hull This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,7 +64,9 @@ p = *string; while ((p = strchr (p, obj))) { + gint offset = p - *string; *string = g_realloc (*string, strlen (*string) + diff + 1); + p = *string + offset; g_memmove (p + rsize, p + osize, strlen (p + osize) + 1); memcpy (p, replacement, rsize); diff -Nru xpad-4.0/src/Makefile.am xpad-4.1/src/Makefile.am --- xpad-4.0/src/Makefile.am 2008-09-28 01:44:10.000000000 +0000 +++ xpad-4.1/src/Makefile.am 2011-11-15 17:17:05.000000000 +0000 @@ -15,7 +15,8 @@ xpad-text-buffer.c xpad-text-buffer.h \ xpad-text-view.c xpad-text-view.h \ xpad-toolbar.c xpad-toolbar.h \ - xpad-tray.c xpad-tray.h + xpad-tray.c xpad-tray.h \ + xpad-undo.c xpad-undo.h AM_CFLAGS = @GTK_CFLAGS@ @X_CFLAGS@ @DEBUG_CFLAGS@ -DDATADIR=\"$(datadir)\" xpad_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @GTK_LIBS@ @INTLLIBS@ @BINRELOC_LIBS@ diff -Nru xpad-4.0/src/Makefile.in xpad-4.1/src/Makefile.in --- xpad-4.0/src/Makefile.in 2009-05-11 12:29:46.000000000 +0000 +++ xpad-4.1/src/Makefile.in 2011-11-15 17:17:40.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -41,8 +43,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_xpad_OBJECTS = fio.$(OBJEXT) help.$(OBJEXT) prefix.$(OBJEXT) \ xpad-app.$(OBJEXT) xpad-grip-tool-item.$(OBJEXT) \ @@ -50,12 +52,13 @@ xpad-pad-properties.$(OBJEXT) xpad-preferences.$(OBJEXT) \ xpad-session-manager.$(OBJEXT) xpad-settings.$(OBJEXT) \ xpad-text-buffer.$(OBJEXT) xpad-text-view.$(OBJEXT) \ - xpad-toolbar.$(OBJEXT) xpad-tray.$(OBJEXT) + xpad-toolbar.$(OBJEXT) xpad-tray.$(OBJEXT) xpad-undo.$(OBJEXT) xpad_OBJECTS = $(am_xpad_OBJECTS) xpad_DEPENDENCIES = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -124,9 +127,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -199,7 +205,8 @@ xpad-text-buffer.c xpad-text-buffer.h \ xpad-text-view.c xpad-text-view.h \ xpad-toolbar.c xpad-toolbar.h \ - xpad-tray.c xpad-tray.h + xpad-tray.c xpad-tray.h \ + xpad-undo.c xpad-undo.h AM_CFLAGS = @GTK_CFLAGS@ @X_CFLAGS@ @DEBUG_CFLAGS@ -DDATADIR=\"$(datadir)\" xpad_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @GTK_LIBS@ @INTLLIBS@ @BINRELOC_LIBS@ @@ -216,9 +223,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -236,26 +243,41 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) @@ -284,17 +306,18 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpad-text-view.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpad-toolbar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpad-tray.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpad-undo.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` @@ -311,7 +334,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -319,29 +342,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -362,13 +390,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -399,6 +431,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -419,6 +452,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -427,18 +462,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binPROGRAMS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -475,6 +520,7 @@ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru xpad-4.0/src/xpad-pad.c xpad-4.1/src/xpad-pad.c --- xpad-4.0/src/xpad-pad.c 2009-05-11 01:44:09.000000000 +0000 +++ xpad-4.1/src/xpad-pad.c 2011-11-15 17:17:05.000000000 +0000 @@ -2,6 +2,9 @@ Copyright (c) 2001-2007 Michael Terry Copyright (c) 2009 Paul Ivanov +Copyright (c) 2011 Sergei Riaguzov +Copyright (c) 2011 Dennis Hilmar +Copytight (c) 2011 OBATA Akio This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,38 +43,38 @@ struct XpadPadPrivate { - /* saved values */ - gint x, y, width, height; - gboolean location_valid; - gchar *infoname; - gchar *contentname; - gboolean sticky; - - /* selected child widgets */ - GtkWidget *textview; - GtkWidget *scrollbar; - - /* toolbar stuff */ - GtkWidget *toolbar; - guint toolbar_timeout; - gint toolbar_height; - gboolean toolbar_expanded; - gboolean toolbar_pad_resized; - - /* properties window */ - GtkWidget *properties; - - /* menus */ - GtkWidget *menu; - GtkWidget *highlight_menu; - - XpadPadGroup *group; + /* saved values */ + gint x, y, width, height; + gboolean location_valid; + gchar *infoname; + gchar *contentname; + gboolean sticky; + + /* selected child widgets */ + GtkWidget *textview; + GtkWidget *scrollbar; + + /* toolbar stuff */ + GtkWidget *toolbar; + guint toolbar_timeout; + gint toolbar_height; + gboolean toolbar_expanded; + gboolean toolbar_pad_resized; + + /* properties window */ + GtkWidget *properties; + + /* menus */ + GtkWidget *menu; + GtkWidget *highlight_menu; + + XpadPadGroup *group; }; enum { - CLOSED, - LAST_SIGNAL + CLOSED, + LAST_SIGNAL }; enum @@ -82,8 +85,6 @@ }; static void load_info (XpadPad *pad, gboolean *show); -static void load_content (XpadPad *pad); -static void save_content (XpadPad *pad); static GtkWidget *menu_get_popup_highlight (XpadPad *pad, GtkAccelGroup *accel_group); static GtkWidget *menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group); static void xpad_pad_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -127,493 +128,489 @@ GtkWidget * xpad_pad_new (XpadPadGroup *group) { - return GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, NULL)); + return GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, NULL)); } GtkWidget * xpad_pad_new_with_info (XpadPadGroup *group, const gchar *info_filename, gboolean *show) { - GtkWidget *pad = GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, NULL)); - - XPAD_PAD (pad)->priv->infoname = g_strdup (info_filename); - load_info (XPAD_PAD (pad), show); - load_content (XPAD_PAD (pad)); - gtk_window_set_role (GTK_WINDOW (pad), XPAD_PAD (pad)->priv->infoname); - - return pad; + GtkWidget *pad = GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, NULL)); + + XPAD_PAD (pad)->priv->infoname = g_strdup (info_filename); + load_info (XPAD_PAD (pad), show); + xpad_load_content (XPAD_PAD (pad)); + gtk_window_set_role (GTK_WINDOW (pad), XPAD_PAD (pad)->priv->infoname); + + return pad; } GtkWidget * xpad_pad_new_from_file (XpadPadGroup *group, const gchar *filename) { - GtkWidget *pad = NULL; - gchar *content; - - content = fio_get_file (filename); - - if (!content) - { - gchar *usertext = g_strdup_printf (_("Could not read file %s."), filename); - xpad_app_error (NULL, usertext, NULL); - g_free (usertext); - } - else - { - GtkTextBuffer *buffer; - - pad = GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, NULL)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (XPAD_PAD (pad)->priv->textview)); - - g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad); - - xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : ""); - g_free (content); - - g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad); - xpad_pad_text_changed(XPAD_PAD(pad), buffer); - } - - return pad; + GtkWidget *pad = NULL; + gchar *content; + + content = fio_get_file (filename); + + if (!content) + { + gchar *usertext = g_strdup_printf (_("Could not read file %s."), filename); + xpad_app_error (NULL, usertext, NULL); + g_free (usertext); + } + else + { + GtkTextBuffer *buffer; + + pad = GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, NULL)); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (XPAD_PAD (pad)->priv->textview)); + + xpad_text_buffer_freeze_undo (XPAD_TEXT_BUFFER (buffer)); + g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad); + + xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : ""); + g_free (content); + + g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad); + xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer)); + + xpad_pad_text_changed(XPAD_PAD(pad), buffer); + } + + return pad; } static void xpad_pad_class_init (XpadPadClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->dispose = xpad_pad_dispose; - gobject_class->finalize = xpad_pad_finalize; - gobject_class->set_property = xpad_pad_set_property; - gobject_class->get_property = xpad_pad_get_property; - - signals[CLOSED] = - g_signal_new ("closed", - G_OBJECT_CLASS_TYPE (gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (XpadPadClass, closed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - /* Properties */ - - g_object_class_install_property (gobject_class, - PROP_GROUP, - g_param_spec_pointer ("group", - "Pad Group", - "Pad group for this pad", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_type_class_add_private (gobject_class, sizeof (XpadPadPrivate)); + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->dispose = xpad_pad_dispose; + gobject_class->finalize = xpad_pad_finalize; + gobject_class->set_property = xpad_pad_set_property; + gobject_class->get_property = xpad_pad_get_property; + + signals[CLOSED] = + g_signal_new ("closed", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (XpadPadClass, closed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + /* Properties */ + + g_object_class_install_property (gobject_class, + PROP_GROUP, + g_param_spec_pointer ("group", + "Pad Group", + "Pad group for this pad", + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + g_type_class_add_private (gobject_class, sizeof (XpadPadPrivate)); } static void xpad_pad_init (XpadPad *pad) { - GtkWidget *vbox; - GtkAccelGroup *accel_group; - - pad->priv = XPAD_PAD_GET_PRIVATE (pad); - - pad->priv->x = 0; - pad->priv->y = 0; - pad->priv->location_valid = FALSE; - pad->priv->width = xpad_settings_get_width (xpad_settings ()); - pad->priv->height = xpad_settings_get_height (xpad_settings ()); - pad->priv->infoname = NULL; - pad->priv->contentname = NULL; - pad->priv->sticky = xpad_settings_get_sticky (xpad_settings ()); - pad->priv->textview = NULL; - pad->priv->scrollbar = NULL; - pad->priv->toolbar = NULL; - pad->priv->toolbar_timeout = 0; - pad->priv->toolbar_height = 0; - pad->priv->toolbar_expanded = FALSE; - pad->priv->toolbar_pad_resized = TRUE; - pad->priv->properties = NULL; - pad->priv->group = NULL; - - pad->priv->textview = GTK_WIDGET (g_object_new (XPAD_TYPE_TEXT_VIEW, - "follow-font-style", TRUE, - "follow-color-style", TRUE, - NULL)); - - pad->priv->scrollbar = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW, - "hadjustment", NULL, - "hscrollbar-policy", GTK_POLICY_NEVER, - "shadow-type", GTK_SHADOW_NONE, - "vadjustment", NULL, - "vscrollbar-policy", GTK_POLICY_NEVER, - "child", pad->priv->textview, - NULL)); - - pad->priv->toolbar = GTK_WIDGET (g_object_new (XPAD_TYPE_TOOLBAR, - NULL)); - - accel_group = gtk_accel_group_new (); - gtk_window_add_accel_group (GTK_WINDOW (pad), accel_group); - g_object_unref (G_OBJECT (accel_group)); - pad->priv->menu = menu_get_popup_no_highlight (pad, accel_group); - pad->priv->highlight_menu = menu_get_popup_highlight (pad, accel_group); - gtk_accel_group_connect (accel_group, GDK_Q, GDK_CONTROL_MASK, 0, - g_cclosure_new_swap (G_CALLBACK (xpad_pad_quit), pad, NULL)); - - - vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX, - "homogeneous", FALSE, - "spacing", 0, - "child", pad->priv->scrollbar, - "child", pad->priv->toolbar, - NULL)); - gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL); - - g_object_set (G_OBJECT (pad), - "decorated", xpad_settings_get_has_decorations (xpad_settings ()), - "default-height", xpad_settings_get_height (xpad_settings ()), - "default-width", xpad_settings_get_width (xpad_settings ()), - "gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving pad x,y work */ - "skip-pager-hint", !xpad_settings_get_has_decorations (xpad_settings ()), - "skip-taskbar-hint", !xpad_settings_get_has_decorations (xpad_settings ()), - "type", GTK_WINDOW_TOPLEVEL, - "type-hint", GDK_WINDOW_TYPE_HINT_NORMAL, - "window-position", GTK_WIN_POS_MOUSE, - "child", vbox, - NULL); - - xpad_pad_notify_has_scrollbar (pad); - - /* Set up signals */ - gtk_widget_add_events (GTK_WIDGET (pad), GDK_BUTTON_PRESS_MASK | GDK_PROPERTY_CHANGE_MASK); - gtk_widget_add_events (pad->priv->toolbar, GDK_ALL_EVENTS_MASK); - g_signal_connect (pad->priv->textview, "button-press-event", G_CALLBACK (xpad_pad_text_view_button_press_event), pad); - g_signal_connect_swapped (pad->priv->textview, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), pad); - g_signal_connect_swapped (pad->priv->toolbar, "size-allocate", G_CALLBACK (xpad_pad_toolbar_size_allocate), pad); - g_signal_connect (pad, "button-press-event", G_CALLBACK (xpad_pad_button_press_event), NULL); - g_signal_connect (pad, "configure-event", G_CALLBACK (xpad_pad_configure_event), NULL); - g_signal_connect (pad, "delete-event", G_CALLBACK (xpad_pad_delete_event), NULL); - g_signal_connect (pad, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), NULL); - g_signal_connect (pad, "show", G_CALLBACK (xpad_pad_show), NULL); - g_signal_connect (pad, "window-state-event", G_CALLBACK (xpad_pad_window_state_event), NULL); - g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "changed", G_CALLBACK (xpad_pad_text_changed), pad); - - g_signal_connect (pad, "enter-notify-event", G_CALLBACK (xpad_pad_enter_notify_event), NULL); - g_signal_connect (pad, "leave-notify-event", G_CALLBACK (xpad_pad_leave_notify_event), NULL); - - g_signal_connect_swapped (xpad_settings (), "notify::has-decorations", G_CALLBACK (xpad_pad_notify_has_decorations), pad); - g_signal_connect_swapped (xpad_settings (), "notify::has-toolbar", G_CALLBACK (xpad_pad_notify_has_toolbar), pad); - g_signal_connect_swapped (xpad_settings (), "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad); - g_signal_connect_swapped (xpad_settings (), "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad); - - g_signal_connect_swapped (pad->priv->toolbar, "activate-new", G_CALLBACK (xpad_pad_spawn), pad); - g_signal_connect_swapped (pad->priv->toolbar, "activate-clear", G_CALLBACK (xpad_pad_clear), pad); - g_signal_connect_swapped (pad->priv->toolbar, "activate-close", G_CALLBACK (xpad_pad_close), pad); - g_signal_connect_swapped (pad->priv->toolbar, "activate-delete", G_CALLBACK (xpad_pad_delete), pad); - g_signal_connect_swapped (pad->priv->toolbar, "activate-properties", G_CALLBACK (xpad_pad_open_properties), pad); - g_signal_connect_swapped (pad->priv->toolbar, "activate-preferences", G_CALLBACK (xpad_pad_open_preferences), pad); - g_signal_connect_swapped (pad->priv->toolbar, "activate-quit", G_CALLBACK (xpad_pad_close_all), pad); - - g_signal_connect (pad->priv->toolbar, "popup", G_CALLBACK (xpad_pad_toolbar_popup), pad); - g_signal_connect (pad->priv->toolbar, "popdown", G_CALLBACK (xpad_pad_toolbar_popdown), pad); - - g_signal_connect (pad->priv->menu, "deactivate", G_CALLBACK (xpad_pad_popup_deactivate), pad); - g_signal_connect (pad->priv->highlight_menu, "deactivate", G_CALLBACK (xpad_pad_popup_deactivate), pad); - - if (pad->priv->sticky) - gtk_window_stick (GTK_WINDOW (pad)); - else - gtk_window_unstick (GTK_WINDOW (pad)); - - xpad_pad_sync_title (pad); - - gtk_widget_show_all (vbox); - - gtk_widget_hide (pad->priv->toolbar); - xpad_pad_notify_has_toolbar (pad); + GtkWidget *vbox; + GtkAccelGroup *accel_group; + + pad->priv = XPAD_PAD_GET_PRIVATE (pad); + + pad->priv->x = 0; + pad->priv->y = 0; + pad->priv->location_valid = FALSE; + pad->priv->width = xpad_settings_get_width (xpad_settings ()); + pad->priv->height = xpad_settings_get_height (xpad_settings ()); + pad->priv->infoname = NULL; + pad->priv->contentname = NULL; + pad->priv->sticky = xpad_settings_get_sticky (xpad_settings ()); + pad->priv->textview = NULL; + pad->priv->scrollbar = NULL; + pad->priv->toolbar = NULL; + pad->priv->toolbar_timeout = 0; + pad->priv->toolbar_height = 0; + pad->priv->toolbar_expanded = FALSE; + pad->priv->toolbar_pad_resized = TRUE; + pad->priv->properties = NULL; + pad->priv->group = NULL; + + pad->priv->textview = GTK_WIDGET (g_object_new (XPAD_TYPE_TEXT_VIEW, + "follow-font-style", TRUE, + "follow-color-style", TRUE, + NULL)); + + pad->priv->scrollbar = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW, + "hadjustment", NULL, + "hscrollbar-policy", GTK_POLICY_NEVER, + "shadow-type", GTK_SHADOW_NONE, + "vadjustment", NULL, + "vscrollbar-policy", GTK_POLICY_NEVER, + "child", pad->priv->textview, + NULL)); + + pad->priv->toolbar = GTK_WIDGET (g_object_new (XPAD_TYPE_TOOLBAR, + NULL)); + + accel_group = gtk_accel_group_new (); + gtk_window_add_accel_group (GTK_WINDOW (pad), accel_group); + g_object_unref (G_OBJECT (accel_group)); + pad->priv->menu = menu_get_popup_no_highlight (pad, accel_group); + pad->priv->highlight_menu = menu_get_popup_highlight (pad, accel_group); + gtk_accel_group_connect (accel_group, GDK_Q, GDK_CONTROL_MASK, 0, + g_cclosure_new_swap (G_CALLBACK (xpad_pad_quit), pad, NULL)); + + + vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX, + "homogeneous", FALSE, + "spacing", 0, + "child", pad->priv->scrollbar, + "child", pad->priv->toolbar, + NULL)); + gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL); + + gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_settings ())); + gtk_window_set_default_size (GTK_WINDOW(pad), xpad_settings_get_width (xpad_settings ()), xpad_settings_get_height (xpad_settings ())); + gtk_window_set_gravity (GTK_WINDOW(pad), GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */ + gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_settings ())); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_settings ())); + gtk_window_set_type_hint (GTK_WINDOW(pad), GDK_WINDOW_TYPE_HINT_NORMAL); + gtk_window_set_position (GTK_WINDOW(pad), GTK_WIN_POS_MOUSE); + + g_object_set (G_OBJECT (pad), + "child", vbox, + NULL); + + xpad_pad_notify_has_scrollbar (pad); + + /* Set up signals */ + gtk_widget_add_events (GTK_WIDGET (pad), GDK_BUTTON_PRESS_MASK | GDK_PROPERTY_CHANGE_MASK); + gtk_widget_add_events (pad->priv->toolbar, GDK_ALL_EVENTS_MASK); + g_signal_connect (pad->priv->textview, "button-press-event", G_CALLBACK (xpad_pad_text_view_button_press_event), pad); + g_signal_connect_swapped (pad->priv->textview, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), pad); + g_signal_connect_swapped (pad->priv->toolbar, "size-allocate", G_CALLBACK (xpad_pad_toolbar_size_allocate), pad); + g_signal_connect (pad, "button-press-event", G_CALLBACK (xpad_pad_button_press_event), NULL); + g_signal_connect (pad, "configure-event", G_CALLBACK (xpad_pad_configure_event), NULL); + g_signal_connect (pad, "delete-event", G_CALLBACK (xpad_pad_delete_event), NULL); + g_signal_connect (pad, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), NULL); + g_signal_connect (pad, "show", G_CALLBACK (xpad_pad_show), NULL); + g_signal_connect (pad, "window-state-event", G_CALLBACK (xpad_pad_window_state_event), NULL); + g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "changed", G_CALLBACK (xpad_pad_text_changed), pad); + + g_signal_connect (pad, "enter-notify-event", G_CALLBACK (xpad_pad_enter_notify_event), NULL); + g_signal_connect (pad, "leave-notify-event", G_CALLBACK (xpad_pad_leave_notify_event), NULL); + + g_signal_connect_swapped (xpad_settings (), "notify::has-decorations", G_CALLBACK (xpad_pad_notify_has_decorations), pad); + g_signal_connect_swapped (xpad_settings (), "notify::has-toolbar", G_CALLBACK (xpad_pad_notify_has_toolbar), pad); + g_signal_connect_swapped (xpad_settings (), "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad); + g_signal_connect_swapped (xpad_settings (), "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad); + + g_signal_connect_swapped (pad->priv->toolbar, "activate-new", G_CALLBACK (xpad_pad_spawn), pad); + g_signal_connect_swapped (pad->priv->toolbar, "activate-clear", G_CALLBACK (xpad_pad_clear), pad); + g_signal_connect_swapped (pad->priv->toolbar, "activate-close", G_CALLBACK (xpad_pad_close), pad); + g_signal_connect_swapped (pad->priv->toolbar, "activate-delete", G_CALLBACK (xpad_pad_delete), pad); + g_signal_connect_swapped (pad->priv->toolbar, "activate-properties", G_CALLBACK (xpad_pad_open_properties), pad); + g_signal_connect_swapped (pad->priv->toolbar, "activate-preferences", G_CALLBACK (xpad_pad_open_preferences), pad); + g_signal_connect_swapped (pad->priv->toolbar, "activate-quit", G_CALLBACK (xpad_pad_close_all), pad); + + g_signal_connect (pad->priv->toolbar, "popup", G_CALLBACK (xpad_pad_toolbar_popup), pad); + g_signal_connect (pad->priv->toolbar, "popdown", G_CALLBACK (xpad_pad_toolbar_popdown), pad); + + g_signal_connect (pad->priv->menu, "deactivate", G_CALLBACK (xpad_pad_popup_deactivate), pad); + g_signal_connect (pad->priv->highlight_menu, "deactivate", G_CALLBACK (xpad_pad_popup_deactivate), pad); + + if (pad->priv->sticky) + gtk_window_stick (GTK_WINDOW (pad)); + else + gtk_window_unstick (GTK_WINDOW (pad)); + + xpad_pad_sync_title (pad); + + gtk_widget_show_all (vbox); + + gtk_widget_hide (pad->priv->toolbar); + xpad_pad_notify_has_toolbar (pad); } static void xpad_pad_show (XpadPad *pad) { - /* Some wm's might not acknowledge our request for a specific - location before we are shown. What we do here is a little gimpy - and not very respectful of wms' sovereignty, but it has the effect - of making pads' locations very dependable. We just move the pad - again here after being shown. This may create a visual effect if - the wm did ignore us, but is better than being in the wrong - place, I guess. */ - if (pad->priv->location_valid) - gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y); - -/* g_object_set (G_OBJECT (pad), - "gravity", GDK_GRAVITY_STATIC, - "skip-pager-hint", TRUE, - "skip-taskbar-hint", TRUE, - NULL);*/ - - if (pad->priv->sticky) - gtk_window_stick (GTK_WINDOW (pad)); - else - gtk_window_unstick (GTK_WINDOW (pad)); - -/* xpad_pad_sync_title (pad);*/ + /* Some wm's might not acknowledge our request for a specific + location before we are shown. What we do here is a little gimpy + and not very respectful of wms' sovereignty, but it has the effect + of making pads' locations very dependable. We just move the pad + again here after being shown. This may create a visual effect if + the wm did ignore us, but is better than being in the wrong + place, I guess. */ + if (pad->priv->location_valid) + gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y); + + if (pad->priv->sticky) + gtk_window_stick (GTK_WINDOW (pad)); + else + gtk_window_unstick (GTK_WINDOW (pad)); + +/* xpad_pad_sync_title (pad);*/ } static void xpad_pad_dispose (GObject *object) { - XpadPad *pad = XPAD_PAD (object); - - if (pad->priv->toolbar_timeout) - { - g_source_remove (pad->priv->toolbar_timeout); - pad->priv->toolbar_timeout = 0; - } - - if (pad->priv->properties) - gtk_widget_destroy (pad->priv->properties); - - gtk_widget_destroy (pad->priv->menu); - gtk_widget_destroy (pad->priv->highlight_menu); - - G_OBJECT_CLASS (xpad_pad_parent_class)->dispose (object); + XpadPad *pad = XPAD_PAD (object); + + if (pad->priv->toolbar_timeout) + { + g_source_remove (pad->priv->toolbar_timeout); + pad->priv->toolbar_timeout = 0; + } + + if (pad->priv->properties) + gtk_widget_destroy (pad->priv->properties); + + gtk_widget_destroy (pad->priv->menu); + gtk_widget_destroy (pad->priv->highlight_menu); + + G_OBJECT_CLASS (xpad_pad_parent_class)->dispose (object); } static void xpad_pad_finalize (GObject *object) { - XpadPad *pad = XPAD_PAD (object); - - g_free (pad->priv->infoname); - g_free (pad->priv->contentname); - - g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad); - - G_OBJECT_CLASS (xpad_pad_parent_class)->finalize (object); + XpadPad *pad = XPAD_PAD (object); + + g_free (pad->priv->infoname); + g_free (pad->priv->contentname); + + g_signal_handlers_disconnect_matched (xpad_settings (), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad); + + G_OBJECT_CLASS (xpad_pad_parent_class)->finalize (object); } static void xpad_pad_notify_has_scrollbar (XpadPad *pad) { - if (xpad_settings_get_has_scrollbar (xpad_settings ())) - { - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - } - else - { - GtkAdjustment *v, *h; - - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), - GTK_POLICY_NEVER, GTK_POLICY_NEVER); - - /* now we need to adjust view so that user can see whole pad */ - h = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar)); - v = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar)); - - gtk_adjustment_set_value (h, 0); - gtk_adjustment_set_value (v, 0); - } + if (xpad_settings_get_has_scrollbar (xpad_settings ())) + { + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + } + else + { + GtkAdjustment *v, *h; + + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), + GTK_POLICY_NEVER, GTK_POLICY_NEVER); + + /* now we need to adjust view so that user can see whole pad */ + h = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar)); + v = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar)); + + gtk_adjustment_set_value (h, 0); + gtk_adjustment_set_value (v, 0); + } } static void xpad_pad_notify_has_decorations (XpadPad *pad) { - gboolean decorations = xpad_settings_get_has_decorations (xpad_settings ()); - - /** - * There are two modes of operation: a normal mode and a 'stealth' mode. - * If decorations are disabled, we also don't show up in the taskbar or pager. - */ - gtk_window_set_decorated (GTK_WINDOW (pad), decorations); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (pad), !decorations); - gtk_window_set_skip_pager_hint (GTK_WINDOW (pad), !decorations); - - /* reshow_with_initial_size() seems to set the window back to a never-shown state. - This is good, as some WMs don't like us changing the above parameters mid-run, - even if we do a hide/show cycle. */ - gtk_window_set_default_size (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); - gtk_window_reshow_with_initial_size (GTK_WINDOW (pad)); + gboolean decorations = xpad_settings_get_has_decorations (xpad_settings ()); + + /** + * There are two modes of operation: a normal mode and a 'stealth' mode. + * If decorations are disabled, we also don't show up in the taskbar or pager. + */ + gtk_window_set_decorated (GTK_WINDOW (pad), decorations); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (pad), !decorations); + gtk_window_set_skip_pager_hint (GTK_WINDOW (pad), !decorations); + + /* reshow_with_initial_size() seems to set the window back to a never-shown state. + This is good, as some WMs don't like us changing the above parameters mid-run, + even if we do a hide/show cycle. */ + gtk_window_set_default_size (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); + gtk_window_reshow_with_initial_size (GTK_WINDOW (pad)); } static gint xpad_pad_text_and_toolbar_height (XpadPad *pad) { - GdkRectangle rec; - gint textx, texty, x, y; - GtkTextIter iter; - - gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(pad->priv->textview), &rec); - gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(pad->priv->textview)), &iter); - gtk_text_view_get_iter_location(GTK_TEXT_VIEW(pad->priv->textview), &iter, &rec); - gtk_text_view_buffer_to_window_coords(GTK_TEXT_VIEW(pad->priv->textview), - GTK_TEXT_WINDOW_WIDGET, rec.x + rec.width, rec.y + rec.height, - &textx, &texty); - gtk_widget_translate_coordinates(pad->priv->textview, GTK_WIDGET(pad), textx, texty, &x, &y); + GdkRectangle rec; + gint textx, texty, x, y; + GtkTextIter iter; + + gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(pad->priv->textview), &rec); + gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(pad->priv->textview)), &iter); + gtk_text_view_get_iter_location(GTK_TEXT_VIEW(pad->priv->textview), &iter, &rec); + gtk_text_view_buffer_to_window_coords(GTK_TEXT_VIEW(pad->priv->textview), + GTK_TEXT_WINDOW_WIDGET, rec.x + rec.width, rec.y + rec.height, + &textx, &texty); + gtk_widget_translate_coordinates(pad->priv->textview, GTK_WIDGET(pad), textx, texty, &x, &y); - return y + pad->priv->toolbar_height + gtk_container_get_border_width(GTK_CONTAINER(pad->priv->textview)); + return y + pad->priv->toolbar_height + gtk_container_get_border_width(GTK_CONTAINER(pad->priv->textview)); } static void xpad_pad_show_toolbar (XpadPad *pad) { - if (!GTK_WIDGET_VISIBLE (pad->priv->toolbar)) - { - GtkRequisition req; - - if (GTK_WIDGET (pad)->window) - gdk_window_freeze_updates (GTK_WIDGET (pad)->window); - gtk_widget_show (pad->priv->toolbar); - if (!pad->priv->toolbar_height) - { - gtk_widget_size_request (pad->priv->toolbar, &req); - pad->priv->toolbar_height = req.height; - } - - /* Do we have room for the toolbar without covering text? */ - if (xpad_pad_text_and_toolbar_height (pad) > pad->priv->height) - { - pad->priv->toolbar_expanded = TRUE; - pad->priv->height += pad->priv->toolbar_height; - gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); - } - else - pad->priv->toolbar_expanded = FALSE; - - pad->priv->toolbar_pad_resized = FALSE; - - if (GTK_WIDGET (pad)->window) - gdk_window_thaw_updates (GTK_WIDGET (pad)->window); - } + if (!GTK_WIDGET_VISIBLE (pad->priv->toolbar)) + { + GtkRequisition req; + + if (GTK_WIDGET (pad)->window) + gdk_window_freeze_updates (GTK_WIDGET (pad)->window); + gtk_widget_show (pad->priv->toolbar); + if (!pad->priv->toolbar_height) + { + gtk_widget_size_request (pad->priv->toolbar, &req); + pad->priv->toolbar_height = req.height; + } + + /* Do we have room for the toolbar without covering text? */ + if (xpad_pad_text_and_toolbar_height (pad) > pad->priv->height) + { + pad->priv->toolbar_expanded = TRUE; + pad->priv->height += pad->priv->toolbar_height; + gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); + } + else + pad->priv->toolbar_expanded = FALSE; + + pad->priv->toolbar_pad_resized = FALSE; + + if (GTK_WIDGET (pad)->window) + gdk_window_thaw_updates (GTK_WIDGET (pad)->window); + } } static void xpad_pad_hide_toolbar (XpadPad *pad) { - if (GTK_WIDGET_VISIBLE (pad->priv->toolbar)) - { - if (GTK_WIDGET (pad)->window) - gdk_window_freeze_updates (GTK_WIDGET (pad)->window); - gtk_widget_hide (pad->priv->toolbar); - - if (pad->priv->toolbar_expanded || - (pad->priv->toolbar_pad_resized && xpad_pad_text_and_toolbar_height (pad) >= pad->priv->height)) - { - pad->priv->height -= pad->priv->toolbar_height; - gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); - pad->priv->toolbar_expanded = FALSE; - } - if (GTK_WIDGET (pad)->window) - gdk_window_thaw_updates (GTK_WIDGET (pad)->window); - } + if (GTK_WIDGET_VISIBLE (pad->priv->toolbar)) + { + if (GTK_WIDGET (pad)->window) + gdk_window_freeze_updates (GTK_WIDGET (pad)->window); + gtk_widget_hide (pad->priv->toolbar); + + if (pad->priv->toolbar_expanded || + (pad->priv->toolbar_pad_resized && xpad_pad_text_and_toolbar_height (pad) >= pad->priv->height)) + { + pad->priv->height -= pad->priv->toolbar_height; + gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); + pad->priv->toolbar_expanded = FALSE; + } + if (GTK_WIDGET (pad)->window) + gdk_window_thaw_updates (GTK_WIDGET (pad)->window); + } } static void xpad_pad_notify_has_toolbar (XpadPad *pad) { - if (xpad_settings_get_has_toolbar (xpad_settings ())) - { - if (!xpad_settings_get_autohide_toolbar (xpad_settings ())) - xpad_pad_show_toolbar (pad); - } - else - xpad_pad_hide_toolbar (pad); + if (xpad_settings_get_has_toolbar (xpad_settings ())) + { + if (!xpad_settings_get_autohide_toolbar (xpad_settings ())) + xpad_pad_show_toolbar (pad); + } + else + xpad_pad_hide_toolbar (pad); } static gboolean toolbar_timeout (XpadPad *pad) { - if (pad->priv->toolbar_timeout && - xpad_settings_get_autohide_toolbar (xpad_settings ()) && - xpad_settings_get_has_toolbar (xpad_settings ())) - xpad_pad_hide_toolbar (pad); - - pad->priv->toolbar_timeout = 0; - - return FALSE; + if (pad->priv->toolbar_timeout && + xpad_settings_get_autohide_toolbar (xpad_settings ()) && + xpad_settings_get_has_toolbar (xpad_settings ())) + xpad_pad_hide_toolbar (pad); + + pad->priv->toolbar_timeout = 0; + + return FALSE; } static void xpad_pad_notify_autohide_toolbar (XpadPad *pad) { - if (xpad_settings_get_autohide_toolbar (xpad_settings ())) - { - /* Likely not to be in pad when turning setting on */ - if (!pad->priv->toolbar_timeout) - pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); - } - else - { - if (xpad_settings_get_has_toolbar (xpad_settings ())) - xpad_pad_show_toolbar(pad); - } + if (xpad_settings_get_autohide_toolbar (xpad_settings ())) + { + /* Likely not to be in pad when turning setting on */ + if (!pad->priv->toolbar_timeout) + pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); + } + else + { + if (xpad_settings_get_has_toolbar (xpad_settings ())) + xpad_pad_show_toolbar(pad); + } } static gboolean xpad_pad_enter_notify_event (GtkWidget *pad, GdkEventCrossing *event) { - if (xpad_settings_get_has_toolbar (xpad_settings ()) && - xpad_settings_get_autohide_toolbar (xpad_settings ()) && - event->detail != GDK_NOTIFY_INFERIOR && - event->mode == GDK_CROSSING_NORMAL) - { - XPAD_PAD (pad)->priv->toolbar_timeout = 0; - xpad_pad_show_toolbar (XPAD_PAD (pad)); - } - - return FALSE; + if (xpad_settings_get_has_toolbar (xpad_settings ()) && + xpad_settings_get_autohide_toolbar (xpad_settings ()) && + event->detail != GDK_NOTIFY_INFERIOR && + event->mode == GDK_CROSSING_NORMAL) + { + XPAD_PAD (pad)->priv->toolbar_timeout = 0; + xpad_pad_show_toolbar (XPAD_PAD (pad)); + } + + return FALSE; } static gboolean xpad_pad_leave_notify_event (GtkWidget *pad, GdkEventCrossing *event) { - if (xpad_settings_get_has_toolbar (xpad_settings ()) && - xpad_settings_get_autohide_toolbar (xpad_settings ()) && - event->detail != GDK_NOTIFY_INFERIOR && - event->mode == GDK_CROSSING_NORMAL) - { - if (!XPAD_PAD (pad)->priv->toolbar_timeout) - XPAD_PAD (pad)->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); - } - - return FALSE; + if (xpad_settings_get_has_toolbar (xpad_settings ()) && + xpad_settings_get_autohide_toolbar (xpad_settings ()) && + event->detail != GDK_NOTIFY_INFERIOR && + event->mode == GDK_CROSSING_NORMAL) + { + if (!XPAD_PAD (pad)->priv->toolbar_timeout) + XPAD_PAD (pad)->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); + } + + return FALSE; } static void xpad_pad_spawn (XpadPad *pad) { - GtkWidget *newpad = xpad_pad_new (pad->priv->group); - gtk_widget_show (newpad); + GtkWidget *newpad = xpad_pad_new (pad->priv->group); + gtk_widget_show (newpad); } static void xpad_pad_clear (XpadPad *pad) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - gtk_text_buffer_set_text (buffer, "", -1); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); + gtk_text_buffer_set_text (buffer, "", -1); } void xpad_pad_close (XpadPad *pad) { - gtk_widget_hide (GTK_WIDGET (pad)); - - /* If no tray and this is the last pad, we don't want to record this - pad as closed, we want to start with just this pad next open. So - quit before we record. */ - if (!xpad_tray_is_open () && - xpad_pad_group_num_visible_pads (pad->priv->group) == 0) - { - xpad_pad_quit (pad); - return; - } - - if (pad->priv->properties) - gtk_widget_destroy (pad->priv->properties); - - xpad_pad_save_info (pad); - - g_signal_emit (pad, signals[CLOSED], 0); + gtk_widget_hide (GTK_WIDGET (pad)); + + /* If no tray and this is the last pad, we don't want to record this + pad as closed, we want to start with just this pad next open. So + quit before we record. */ + if (!xpad_tray_is_open () && + xpad_pad_group_num_visible_pads (pad->priv->group) == 0) + { + xpad_pad_quit (pad); + return; + } + + if (pad->priv->properties) + gtk_widget_destroy (pad->priv->properties); + + xpad_pad_save_info (pad); + + g_signal_emit (pad, signals[CLOSED], 0); } void @@ -628,622 +625,625 @@ static gboolean should_confirm_delete (XpadPad *pad) { - GtkTextBuffer *buffer; - GtkTextIter s, e; - gchar *content; - gboolean confirm; - - if (!xpad_settings_get_confirm_destroy (xpad_settings ())) - return FALSE; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - gtk_text_buffer_get_bounds (buffer, &s, &e); - content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE); - - confirm = strcmp (g_strstrip (content), "") != 0; - - g_free (content); - - return confirm; + GtkTextBuffer *buffer; + GtkTextIter s, e; + gchar *content; + gboolean confirm; + + if (!xpad_settings_get_confirm_destroy (xpad_settings ())) + return FALSE; + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); + gtk_text_buffer_get_bounds (buffer, &s, &e); + content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE); + + confirm = strcmp (g_strstrip (content), "") != 0; + + g_free (content); + + return confirm; } static void xpad_pad_delete (XpadPad *pad) { - if (should_confirm_delete (pad)) - { - GtkWidget *dialog; - gint response; - - dialog = xpad_app_alert_new (GTK_WINDOW (pad), GTK_STOCK_DIALOG_WARNING, - _("Delete this pad?"), - _("All text of this pad will be irrevocably lost.")); - - if (!dialog) - return; - - gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, 1, GTK_STOCK_DELETE, 2, NULL); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - - gtk_widget_destroy (dialog); - - if (response != 2) - return; - } - - if (pad->priv->infoname) - fio_remove_file (pad->priv->infoname); - if (pad->priv->contentname) - fio_remove_file (pad->priv->contentname); - - gtk_widget_destroy (GTK_WIDGET (pad)); + if (should_confirm_delete (pad)) + { + GtkWidget *dialog; + gint response; + + dialog = xpad_app_alert_new (GTK_WINDOW (pad), GTK_STOCK_DIALOG_WARNING, + _("Delete this pad?"), + _("All text of this pad will be irrevocably lost.")); + + if (!dialog) + return; + + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, 1, GTK_STOCK_DELETE, 2, NULL); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + + if (response != 2) + return; + } + + if (pad->priv->infoname) + fio_remove_file (pad->priv->infoname); + if (pad->priv->contentname) + fio_remove_file (pad->priv->contentname); + + gtk_widget_destroy (GTK_WIDGET (pad)); } static void pad_properties_sync_title (XpadPad *pad) { - gchar *title; - - if (!pad->priv->properties) - return; - - title = g_strdup_printf (_("'%s' Properties"), gtk_window_get_title (GTK_WINDOW (pad))); - gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title); - g_free (title); + gchar *title; + + if (!pad->priv->properties) + return; + + title = g_strdup_printf (_("'%s' Properties"), gtk_window_get_title (GTK_WINDOW (pad))); + gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title); + g_free (title); } static void pad_properties_destroyed (XpadPad *pad) { - if (!pad->priv->properties) - return; - - g_signal_handlers_disconnect_by_func (pad, (gpointer) pad_properties_sync_title, NULL); - pad->priv->properties = NULL; + if (!pad->priv->properties) + return; + + g_signal_handlers_disconnect_by_func (pad, (gpointer) pad_properties_sync_title, NULL); + pad->priv->properties = NULL; } static void prop_notify_follow_font (XpadPad *pad) { - XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); - - xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_font_style (prop)); - - if (!xpad_pad_properties_get_follow_font_style (prop)) - { - const gchar *font = xpad_pad_properties_get_fontname (prop); - PangoFontDescription *fontdesc; - - fontdesc = font ? pango_font_description_from_string (font) : NULL; - gtk_widget_modify_font (pad->priv->textview, fontdesc); - if (fontdesc) - pango_font_description_free (fontdesc); - } - - xpad_pad_save_info (pad); + XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); + + xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_font_style (prop)); + + if (!xpad_pad_properties_get_follow_font_style (prop)) + { + const gchar *font = xpad_pad_properties_get_fontname (prop); + PangoFontDescription *fontdesc; + + fontdesc = font ? pango_font_description_from_string (font) : NULL; + gtk_widget_modify_font (pad->priv->textview, fontdesc); + if (fontdesc) + pango_font_description_free (fontdesc); + } + + xpad_pad_save_info (pad); } static void prop_notify_follow_color (XpadPad *pad) { - XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); - - xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_color_style (prop)); - - if (!xpad_pad_properties_get_follow_color_style (prop)) - { - gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop)); - gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop)); - } - - xpad_pad_save_info (pad); + XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); + + xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_color_style (prop)); + + if (!xpad_pad_properties_get_follow_color_style (prop)) + { + gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop)); + gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop)); + } + + xpad_pad_save_info (pad); } static void prop_notify_text (XpadPad *pad) { - XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); - - gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop)); - - xpad_pad_save_info (pad); + XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); + + gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop)); + + xpad_pad_save_info (pad); } static void prop_notify_back (XpadPad *pad) { - XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); - - gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop)); - - xpad_pad_save_info (pad); + XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); + + gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop)); + + xpad_pad_save_info (pad); } static void prop_notify_font (XpadPad *pad) { - XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); - - const gchar *font = xpad_pad_properties_get_fontname (prop); - PangoFontDescription *fontdesc; - - fontdesc = font ? pango_font_description_from_string (font) : NULL; - gtk_widget_modify_font (pad->priv->textview, fontdesc); - if (fontdesc) - pango_font_description_free (fontdesc); - - xpad_pad_save_info (pad); + XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties); + + const gchar *font = xpad_pad_properties_get_fontname (prop); + PangoFontDescription *fontdesc; + + fontdesc = font ? pango_font_description_from_string (font) : NULL; + gtk_widget_modify_font (pad->priv->textview, fontdesc); + if (fontdesc) + pango_font_description_free (fontdesc); + + xpad_pad_save_info (pad); } static void xpad_pad_open_properties (XpadPad *pad) { - GtkStyle *style; - gchar *fontname; - - if (pad->priv->properties) - { - gtk_window_present (GTK_WINDOW (pad->priv->properties)); - return; - } - - pad->priv->properties = xpad_pad_properties_new (); - - gtk_window_set_transient_for (GTK_WINDOW (pad->priv->properties), GTK_WINDOW (pad)); - gtk_window_set_resizable (GTK_WINDOW (pad->priv->properties), FALSE); - - g_signal_connect_swapped (pad->priv->properties, "destroy", G_CALLBACK (pad_properties_destroyed), pad); - g_signal_connect (pad, "notify::title", G_CALLBACK (pad_properties_sync_title), NULL); - - style = gtk_widget_get_style (pad->priv->textview); - fontname = style->font_desc ? pango_font_description_to_string (style->font_desc) : NULL; - g_object_set (G_OBJECT (pad->priv->properties), - "follow-font-style", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)), - "follow-color-style", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)), - "back-color", &style->base[GTK_STATE_NORMAL], - "text-color", &style->text[GTK_STATE_NORMAL], - "fontname", fontname, - NULL); - g_free (fontname); - - g_signal_connect_swapped (pad->priv->properties, "notify::follow-font-style", G_CALLBACK (prop_notify_follow_font), pad); - g_signal_connect_swapped (pad->priv->properties, "notify::follow-color-style", G_CALLBACK (prop_notify_follow_color), pad); - g_signal_connect_swapped (pad->priv->properties, "notify::text-color", G_CALLBACK (prop_notify_text), pad); - g_signal_connect_swapped (pad->priv->properties, "notify::back-color", G_CALLBACK (prop_notify_back), pad); - g_signal_connect_swapped (pad->priv->properties, "notify::fontname", G_CALLBACK (prop_notify_font), pad); - - pad_properties_sync_title (pad); - - gtk_widget_show (pad->priv->properties); + GtkStyle *style; + gchar *fontname; + + if (pad->priv->properties) + { + gtk_window_present (GTK_WINDOW (pad->priv->properties)); + return; + } + + pad->priv->properties = xpad_pad_properties_new (); + + gtk_window_set_transient_for (GTK_WINDOW (pad->priv->properties), GTK_WINDOW (pad)); + gtk_window_set_resizable (GTK_WINDOW (pad->priv->properties), FALSE); + + g_signal_connect_swapped (pad->priv->properties, "destroy", G_CALLBACK (pad_properties_destroyed), pad); + g_signal_connect (pad, "notify::title", G_CALLBACK (pad_properties_sync_title), NULL); + + style = gtk_widget_get_style (pad->priv->textview); + fontname = style->font_desc ? pango_font_description_to_string (style->font_desc) : NULL; + g_object_set (G_OBJECT (pad->priv->properties), + "follow-font-style", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)), + "follow-color-style", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)), + "back-color", &style->base[GTK_STATE_NORMAL], + "text-color", &style->text[GTK_STATE_NORMAL], + "fontname", fontname, + NULL); + g_free (fontname); + + g_signal_connect_swapped (pad->priv->properties, "notify::follow-font-style", G_CALLBACK (prop_notify_follow_font), pad); + g_signal_connect_swapped (pad->priv->properties, "notify::follow-color-style", G_CALLBACK (prop_notify_follow_color), pad); + g_signal_connect_swapped (pad->priv->properties, "notify::text-color", G_CALLBACK (prop_notify_text), pad); + g_signal_connect_swapped (pad->priv->properties, "notify::back-color", G_CALLBACK (prop_notify_back), pad); + g_signal_connect_swapped (pad->priv->properties, "notify::fontname", G_CALLBACK (prop_notify_font), pad); + + pad_properties_sync_title (pad); + + gtk_widget_show (pad->priv->properties); } static void xpad_pad_open_preferences (XpadPad *pad) { - xpad_preferences_open (); + xpad_preferences_open (); } static void xpad_pad_quit (XpadPad *pad) { - gtk_main_quit (); + gtk_main_quit (); } static void xpad_pad_text_changed (XpadPad *pad, GtkTextBuffer *buffer) { - /* set title */ - xpad_pad_sync_title (pad); - - /* record change */ - save_content (pad); + /* set title */ + xpad_pad_sync_title (pad); + + /* record change */ + xpad_save_content (pad); } static gboolean xpad_pad_toolbar_size_allocate (XpadPad *pad, GtkAllocation *event) { - pad->priv->toolbar_height = event->height; - return FALSE; + pad->priv->toolbar_height = event->height; + return FALSE; } static gboolean xpad_pad_configure_event (XpadPad *pad, GdkEventConfigure *event) { - if (!GTK_WIDGET_VISIBLE (pad)) - return FALSE; - - if (pad->priv->width != event->width || pad->priv->height != event->height) - pad->priv->toolbar_pad_resized = TRUE; - - pad->priv->x = event->x; - pad->priv->y = event->y; - pad->priv->width = event->width; - pad->priv->height = event->height; - pad->priv->location_valid = TRUE; - - xpad_pad_save_info (pad); - - /* Sometimes when moving, if the toolbar tries to hide itself, - the window manager will not resize it correctly. So, we make - sure not to end the timeout while moving. */ - if (pad->priv->toolbar_timeout) - { - g_source_remove (pad->priv->toolbar_timeout); - pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); - } - - return FALSE; + if (!GTK_WIDGET_VISIBLE (pad)) + return FALSE; + + if (pad->priv->width != event->width || pad->priv->height != event->height) + pad->priv->toolbar_pad_resized = TRUE; + + pad->priv->x = event->x; + pad->priv->y = event->y; + pad->priv->width = event->width; + pad->priv->height = event->height; + pad->priv->location_valid = TRUE; + + xpad_pad_save_info (pad); + + /* Sometimes when moving, if the toolbar tries to hide itself, + the window manager will not resize it correctly. So, we make + sure not to end the timeout while moving. */ + if (pad->priv->toolbar_timeout) + { + g_source_remove (pad->priv->toolbar_timeout); + pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); + } + + return FALSE; } static gboolean xpad_pad_window_state_event (XpadPad *pad, GdkEventWindowState *event) { - if (event->changed_mask & GDK_WINDOW_STATE_STICKY) { - if (GTK_WIDGET_VISIBLE (pad)) - { - pad->priv->sticky = (event->new_window_state & GDK_WINDOW_STATE_STICKY) ? TRUE : FALSE; - xpad_pad_save_info (pad); - } - } - - return FALSE; + if (event->changed_mask & GDK_WINDOW_STATE_STICKY) { + if (GTK_WIDGET_VISIBLE (pad)) + { + pad->priv->sticky = (event->new_window_state & GDK_WINDOW_STATE_STICKY) ? TRUE : FALSE; + xpad_pad_save_info (pad); + } + } + + return FALSE; } static gboolean xpad_pad_delete_event (XpadPad *pad, GdkEvent *event) { - xpad_pad_close (pad); - - return TRUE; + xpad_pad_close (pad); + + return TRUE; } static gboolean xpad_pad_popup_menu (XpadPad *pad) { - xpad_pad_popup (pad, NULL); - - return TRUE; + xpad_pad_popup (pad, NULL); + + return TRUE; } static gboolean xpad_pad_text_view_button_press_event (GtkWidget *text_view, GdkEventButton *event, XpadPad *pad) { - if (event->type == GDK_BUTTON_PRESS) - { - switch (event->button) - { - case 1: - if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) - { - gtk_window_begin_move_drag (GTK_WINDOW (pad), event->button, event->x_root, event->y_root, event->time); - return TRUE; - } - break; - - case 3: - if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) - { - GdkWindowEdge edge; - - if (gtk_widget_get_direction (GTK_WIDGET (pad)) == GTK_TEXT_DIR_LTR) - edge = GDK_WINDOW_EDGE_SOUTH_EAST; - else - edge = GDK_WINDOW_EDGE_SOUTH_WEST; - - gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, event->button, event->x_root, event->y_root, event->time); - } - else - { - xpad_pad_popup (pad, event); - } - return TRUE; - } - } - - return FALSE; + if (event->type == GDK_BUTTON_PRESS) + { + switch (event->button) + { + case 1: + if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) + { + gtk_window_begin_move_drag (GTK_WINDOW (pad), event->button, event->x_root, event->y_root, event->time); + return TRUE; + } + break; + + case 3: + if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) + { + GdkWindowEdge edge; + + if (gtk_widget_get_direction (GTK_WIDGET (pad)) == GTK_TEXT_DIR_LTR) + edge = GDK_WINDOW_EDGE_SOUTH_EAST; + else + edge = GDK_WINDOW_EDGE_SOUTH_WEST; + + gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, event->button, event->x_root, event->y_root, event->time); + } + else + { + xpad_pad_popup (pad, event); + } + return TRUE; + } + } + + return FALSE; } static gboolean xpad_pad_button_press_event (XpadPad *pad, GdkEventButton *event) { - if (event->type == GDK_BUTTON_PRESS) - { - switch (event->button) - { - case 1: - gtk_window_begin_move_drag (GTK_WINDOW (pad), event->button, event->x_root, event->y_root, event->time); - return TRUE; - - case 3: - if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) - { - GdkWindowEdge edge; - - if (gtk_widget_get_direction (GTK_WIDGET (pad)) == GTK_TEXT_DIR_LTR) - edge = GDK_WINDOW_EDGE_SOUTH_EAST; - else - edge = GDK_WINDOW_EDGE_SOUTH_WEST; - - gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, event->button, event->x_root, event->y_root, event->time); - } - else - { - xpad_pad_popup (pad, event); - } - return TRUE; - } - } - - return FALSE; + if (event->type == GDK_BUTTON_PRESS) + { + switch (event->button) + { + case 1: + gtk_window_begin_move_drag (GTK_WINDOW (pad), event->button, event->x_root, event->y_root, event->time); + return TRUE; + + case 3: + if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) + { + GdkWindowEdge edge; + + if (gtk_widget_get_direction (GTK_WIDGET (pad)) == GTK_TEXT_DIR_LTR) + edge = GDK_WINDOW_EDGE_SOUTH_EAST; + else + edge = GDK_WINDOW_EDGE_SOUTH_WEST; + + gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, event->button, event->x_root, event->y_root, event->time); + } + else + { + xpad_pad_popup (pad, event); + } + return TRUE; + } + } + + return FALSE; } static void xpad_pad_sync_title (XpadPad *pad) { - GtkTextBuffer *buffer; - GtkTextIter s, e; - gchar *content, *end; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - gtk_text_buffer_get_bounds (buffer, &s, &e); - content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE); - end = g_utf8_strchr (content, -1, '\n'); - if (end) - *end = '\0'; - - gtk_window_set_title (GTK_WINDOW (pad), g_strstrip (content)); - - g_free (content); + GtkTextBuffer *buffer; + GtkTextIter s, e; + gchar *content, *end; + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); + gtk_text_buffer_get_bounds (buffer, &s, &e); + content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE); + end = g_utf8_strchr (content, -1, '\n'); + if (end) + *end = '\0'; + + gtk_window_set_title (GTK_WINDOW (pad), g_strstrip (content)); + + g_free (content); } static void xpad_pad_set_group (XpadPad *pad, XpadPadGroup *group) { - pad->priv->group = group; - if (group) - xpad_pad_group_add (group, GTK_WIDGET (pad)); + pad->priv->group = group; + if (group) + xpad_pad_group_add (group, GTK_WIDGET (pad)); } static XpadPadGroup * xpad_pad_get_group (XpadPad *pad) { - return pad->priv->group; + return pad->priv->group; } static void xpad_pad_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - XpadPad *pad; - - pad = XPAD_PAD (object); - - switch (prop_id) - { - case PROP_GROUP: - xpad_pad_set_group (pad, g_value_get_pointer (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + XpadPad *pad; + + pad = XPAD_PAD (object); + + switch (prop_id) + { + case PROP_GROUP: + xpad_pad_set_group (pad, g_value_get_pointer (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void xpad_pad_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - XpadPad *pad; - - pad = XPAD_PAD (object); - - switch (prop_id) - { - case PROP_GROUP: - g_value_set_pointer (value, xpad_pad_get_group (pad)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + XpadPad *pad; + + pad = XPAD_PAD (object); + + switch (prop_id) + { + case PROP_GROUP: + g_value_set_pointer (value, xpad_pad_get_group (pad)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } -static void -load_content (XpadPad *pad) -{ - gchar *content; - GtkTextBuffer *buffer; - - if (!pad->priv->contentname) - return; - - content = fio_get_file (pad->priv->contentname); - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - - g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad); - - xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : ""); - g_free (content); - - g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad); - xpad_pad_text_changed(pad, buffer); +void +xpad_load_content (XpadPad *pad) +{ + gchar *content; + GtkTextBuffer *buffer; + + if (!pad->priv->contentname) + return; + + content = fio_get_file (pad->priv->contentname); + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); + + xpad_text_buffer_freeze_undo (XPAD_TEXT_BUFFER (buffer)); + g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad); + + xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : ""); + g_free (content); + + g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad); + xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer)); + + xpad_pad_text_changed(pad, buffer); } -static void -save_content (XpadPad *pad) -{ - gchar *content; - GtkTextBuffer *buffer; - - /* create content file if it doesn't exist yet */ - if (!pad->priv->contentname) - { - pad->priv->contentname = fio_unique_name ("content-"); - if (!pad->priv->contentname) - return; - } - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer)); - - fio_set_file (pad->priv->contentname, content); - - g_free (content); +void +xpad_save_content (XpadPad *pad) +{ + gchar *content; + GtkTextBuffer *buffer; + + /* create content file if it doesn't exist yet */ + if (!pad->priv->contentname) + { + pad->priv->contentname = fio_unique_name ("content-"); + if (!pad->priv->contentname) + return; + } + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); + content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer)); + + fio_set_file (pad->priv->contentname, content); + + g_free (content); } static void load_info (XpadPad *pad, gboolean *show) { - gboolean locked = FALSE, follow_font = TRUE, follow_color = TRUE; - gboolean hidden = FALSE; - GdkColor text = {0}, back = {0}; - gchar *fontname = NULL, *oldcontentprefix; - - if (!pad->priv->infoname) - return; - - if (fio_get_values_from_file (pad->priv->infoname, - "i|width", &pad->priv->width, - "i|height", &pad->priv->height, - "i|x", &pad->priv->x, - "i|y", &pad->priv->y, - "b|locked", &locked, - "b|follow_font", &follow_font, - "b|follow_color", &follow_color, - "b|sticky", &pad->priv->sticky, - "b|hidden", &hidden, - "h|back_red", &back.red, - "h|back_green", &back.green, - "h|back_blue", &back.blue, - "h|text_red", &text.red, - "h|text_green", &text.green, - "h|text_blue", &text.blue, - "s|fontname", &fontname, - "s|content", &pad->priv->contentname, - NULL)) - return; - - pad->priv->location_valid = TRUE; - if (xpad_settings_get_has_toolbar (xpad_settings ()) && - !xpad_settings_get_autohide_toolbar (xpad_settings ())) - { - pad->priv->toolbar_height = 0; - xpad_pad_hide_toolbar (pad); - xpad_pad_show_toolbar (pad); /* these will resize pad at correct height */ - } - else - gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); - gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y); - - xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_font); - xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_color); - - /* obsolete setting, no longer written as of xpad-2.0-b2 */ - if (locked) - { - xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), FALSE); - xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), FALSE); - } - - if (!xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview))) - { - gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, &text); - gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, &back); - } - - if (!xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview))) - { - PangoFontDescription *font_desc = pango_font_description_from_string (fontname); - gtk_widget_modify_font (pad->priv->textview, font_desc); - pango_font_description_free (font_desc); - } - - if (pad->priv->sticky) - gtk_window_stick (GTK_WINDOW (pad)); - else - gtk_window_unstick (GTK_WINDOW (pad)); - - /* Special check for contentname being absolute. A while back, - xpad had absolute pathnames, pointing to ~/.xpad/content-*. - Now, files are kept in ~/.config/xpad, so using old config - files with a new xpad will break pads. We check to see if - contentname is old pointer and then make it relative. */ - oldcontentprefix = g_build_filename (g_get_home_dir (), ".xpad", "content-", NULL); - if (g_str_has_prefix (pad->priv->contentname, oldcontentprefix)) - { - gchar *oldcontent = pad->priv->contentname; - pad->priv->contentname = g_path_get_basename (oldcontent); - g_free (oldcontent); - } - g_free (oldcontentprefix); - - if (show) - *show = !hidden; + gboolean locked = FALSE, follow_font = TRUE, follow_color = TRUE; + gboolean hidden = FALSE; + GdkColor text = {0}, back = {0}; + gchar *fontname = NULL, *oldcontentprefix; + + if (!pad->priv->infoname) + return; + + if (fio_get_values_from_file (pad->priv->infoname, + "i|width", &pad->priv->width, + "i|height", &pad->priv->height, + "i|x", &pad->priv->x, + "i|y", &pad->priv->y, + "b|locked", &locked, + "b|follow_font", &follow_font, + "b|follow_color", &follow_color, + "b|sticky", &pad->priv->sticky, + "b|hidden", &hidden, + "h|back_red", &back.red, + "h|back_green", &back.green, + "h|back_blue", &back.blue, + "h|text_red", &text.red, + "h|text_green", &text.green, + "h|text_blue", &text.blue, + "s|fontname", &fontname, + "s|content", &pad->priv->contentname, + NULL)) + return; + + pad->priv->location_valid = TRUE; + if (xpad_settings_get_has_toolbar (xpad_settings ()) && + !xpad_settings_get_autohide_toolbar (xpad_settings ())) + { + pad->priv->toolbar_height = 0; + xpad_pad_hide_toolbar (pad); + xpad_pad_show_toolbar (pad); /* these will resize pad at correct height */ + } + else + gtk_window_resize (GTK_WINDOW (pad), pad->priv->width, pad->priv->height); + gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y); + + xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_font); + xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_color); + + /* obsolete setting, no longer written as of xpad-2.0-b2 */ + if (locked) + { + xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), FALSE); + xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), FALSE); + } + + if (!xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview))) + { + gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, &text); + gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, &back); + } + + if (!xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview))) + { + PangoFontDescription *font_desc = pango_font_description_from_string (fontname); + gtk_widget_modify_font (pad->priv->textview, font_desc); + pango_font_description_free (font_desc); + } + + if (pad->priv->sticky) + gtk_window_stick (GTK_WINDOW (pad)); + else + gtk_window_unstick (GTK_WINDOW (pad)); + + /* Special check for contentname being absolute. A while back, + xpad had absolute pathnames, pointing to ~/.xpad/content-*. + Now, files are kept in ~/.config/xpad, so using old config + files with a new xpad will break pads. We check to see if + contentname is old pointer and then make it relative. */ + oldcontentprefix = g_build_filename (g_get_home_dir (), ".xpad", "content-", NULL); + if (g_str_has_prefix (pad->priv->contentname, oldcontentprefix)) + { + gchar *oldcontent = pad->priv->contentname; + pad->priv->contentname = g_path_get_basename (oldcontent); + g_free (oldcontent); + } + g_free (oldcontentprefix); + + if (show) + *show = !hidden; } void xpad_pad_save_info (XpadPad *pad) { - gint height; - GtkStyle *style; - gchar *fontname; - - /* Must create pad info file if it doesn't exist yet */ - if (!pad->priv->infoname) - { - pad->priv->infoname = fio_unique_name ("info-"); - if (!pad->priv->infoname) - return; - gtk_window_set_role (GTK_WINDOW (pad), pad->priv->infoname); - } - /* create content file if it doesn't exist yet */ - if (!pad->priv->contentname) - { - pad->priv->contentname = fio_unique_name ("content-"); - if (!pad->priv->contentname) - return; - } - - height = pad->priv->height; - if (GTK_WIDGET_VISIBLE (pad->priv->toolbar) && pad->priv->toolbar_expanded) - height -= pad->priv->toolbar_height; - - style = gtk_widget_get_style (pad->priv->textview); - fontname = pango_font_description_to_string (style->font_desc); - - fio_set_values_to_file (pad->priv->infoname, - "i|width", pad->priv->width, - "i|height", height, - "i|x", pad->priv->x, - "i|y", pad->priv->y, - "b|follow_font", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)), - "b|follow_color", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)), - "b|sticky", pad->priv->sticky, - "b|hidden", !GTK_WIDGET_VISIBLE (pad), - "h|back_red", style->base[GTK_STATE_NORMAL].red, - "h|back_green", style->base[GTK_STATE_NORMAL].green, - "h|back_blue", style->base[GTK_STATE_NORMAL].blue, - "h|text_red", style->text[GTK_STATE_NORMAL].red, - "h|text_green", style->text[GTK_STATE_NORMAL].green, - "h|text_blue", style->text[GTK_STATE_NORMAL].blue, - "s|fontname", fontname, - "s|content", pad->priv->contentname, - NULL); - - g_free (fontname); + gint height; + GtkStyle *style; + gchar *fontname; + + /* Must create pad info file if it doesn't exist yet */ + if (!pad->priv->infoname) + { + pad->priv->infoname = fio_unique_name ("info-"); + if (!pad->priv->infoname) + return; + gtk_window_set_role (GTK_WINDOW (pad), pad->priv->infoname); + } + /* create content file if it doesn't exist yet */ + if (!pad->priv->contentname) + { + pad->priv->contentname = fio_unique_name ("content-"); + if (!pad->priv->contentname) + return; + } + + height = pad->priv->height; + if (GTK_WIDGET_VISIBLE (pad->priv->toolbar) && pad->priv->toolbar_expanded) + height -= pad->priv->toolbar_height; + + style = gtk_widget_get_style (pad->priv->textview); + fontname = pango_font_description_to_string (style->font_desc); + + fio_set_values_to_file (pad->priv->infoname, + "i|width", pad->priv->width, + "i|height", height, + "i|x", pad->priv->x, + "i|y", pad->priv->y, + "b|follow_font", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)), + "b|follow_color", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)), + "b|sticky", pad->priv->sticky, + "b|hidden", !GTK_WIDGET_VISIBLE (pad), + "h|back_red", style->base[GTK_STATE_NORMAL].red, + "h|back_green", style->base[GTK_STATE_NORMAL].green, + "h|back_blue", style->base[GTK_STATE_NORMAL].blue, + "h|text_red", style->text[GTK_STATE_NORMAL].red, + "h|text_green", style->text[GTK_STATE_NORMAL].green, + "h|text_blue", style->text[GTK_STATE_NORMAL].blue, + "s|fontname", fontname, + "s|content", pad->priv->contentname, + NULL); + + g_free (fontname); } static void menu_about (XpadPad *pad) { - const gchar *artists[] = {"Michael Terry ", NULL}; - const gchar *authors[] = {"Jeroen Vermeulen ", "Michael Terry ", "Paul Ivanov ", NULL}; - const gchar *comments = _("Sticky notes"); - const gchar *copyright = "© 2001-2007 Michael Terry"; - /* we use g_strdup_printf because C89 has size limits on static strings */ - gchar *license = g_strdup_printf ("%s\n%s\n%s", + const gchar *artists[] = {"Michael Terry ", NULL}; + const gchar *authors[] = {"Jeroen Vermeulen ", "Michael Terry ", "Paul Ivanov ", NULL}; + const gchar *comments = _("Sticky notes"); + const gchar *copyright = "© 2001-2007 Michael Terry"; + /* we use g_strdup_printf because C89 has size limits on static strings */ + gchar *license = g_strdup_printf ("%s\n%s\n%s", "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" "as published by the Free Software Foundation; either version 3\n" @@ -1257,501 +1257,522 @@ "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."); - /* Translators: please translate this as your own name and optionally email - like so: "Your Name " */ - const gchar *translator_credits = _("translator-credits"); - const gchar *website = "http://xpad.sourceforge.net/"; - - gtk_show_about_dialog (GTK_WINDOW (pad), - "artists", artists, - "authors", authors, - "comments", comments, - "copyright", copyright, - "license", license, - "logo-icon-name", PACKAGE, - "translator-credits", translator_credits, - "version", VERSION, - "website", website, - NULL); - - g_free (license); + /* Translators: please translate this as your own name and optionally email + like so: "Your Name " */ + const gchar *translator_credits = _("translator-credits"); + const gchar *website = "http://xpad.sourceforge.net/"; + + gtk_show_about_dialog (GTK_WINDOW (pad), + "artists", artists, + "authors", authors, + "comments", comments, + "copyright", copyright, + "license", license, + "logo-icon-name", PACKAGE, + "translator-credits", translator_credits, + "version", VERSION, + "website", website, + NULL); + + g_free (license); } static void menu_cut (XpadPad *pad) { - gtk_text_buffer_cut_clipboard ( - gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), - gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - TRUE); + gtk_text_buffer_cut_clipboard ( + gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), + gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + TRUE); } static void menu_copy (XpadPad *pad) { - gtk_text_buffer_copy_clipboard ( - gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), - gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)); + gtk_text_buffer_copy_clipboard ( + gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), + gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)); } static void menu_paste (XpadPad *pad) { - gtk_text_buffer_paste_clipboard ( - gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), - gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - NULL, - TRUE); + gtk_text_buffer_paste_clipboard ( + gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), + gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + NULL, + TRUE); +} + +static void +menu_undo (XpadPad *pad) +{ + g_return_if_fail (pad->priv->textview); + XpadTextBuffer *buffer = NULL; + buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview))); + g_return_if_fail (buffer); + xpad_text_buffer_undo (buffer); +} + +static void +menu_redo (XpadPad *pad) +{ + g_return_if_fail (pad->priv->textview); + XpadTextBuffer *buffer = NULL; + buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview))); + g_return_if_fail (buffer); + xpad_text_buffer_redo (buffer); } static void menu_show_all (XpadPad *pad) { - GSList *pads, *i; - - if (!pad->priv->group) - return; - - pads = xpad_pad_group_get_pads (pad->priv->group); - - for (i = pads; i; i = i->next) - { - if (XPAD_PAD (i->data) != pad) - gtk_window_present (GTK_WINDOW (i->data)); - } - gtk_window_present (GTK_WINDOW (pad)); - - g_slist_free (pads); + GSList *pads, *i; + + if (!pad->priv->group) + return; + + pads = xpad_pad_group_get_pads (pad->priv->group); + + for (i = pads; i; i = i->next) + { + if (XPAD_PAD (i->data) != pad) + gtk_window_present (GTK_WINDOW (i->data)); + } + gtk_window_present (GTK_WINDOW (pad)); + + g_slist_free (pads); } static void xpad_pad_close_all (XpadPad *pad) { - if (!pad->priv->group) - return; - - /** - * The logic is different here depending on whether the tray is open. - * If it is open, we just close each pad individually. If it isn't - * open, we do a quit. This way, when xpad is run again, only the - * pads open during the last 'close all' will open again. - */ - if (xpad_tray_is_open ()) - xpad_pad_group_close_all (pad->priv->group); - else - xpad_pad_quit (pad); + if (!pad->priv->group) + return; + + /** + * The logic is different here depending on whether the tray is open. + * If it is open, we just close each pad individually. If it isn't + * open, we do a quit. This way, when xpad is run again, only the + * pads open during the last 'close all' will open again. + */ + if (xpad_tray_is_open ()) + xpad_pad_group_close_all (pad->priv->group); + else + xpad_pad_quit (pad); } static void menu_show (XpadPad *pad) { - gtk_window_present (GTK_WINDOW (pad)); + gtk_window_present (GTK_WINDOW (pad)); } static void menu_toggle_tag (XpadPad *pad, const gchar *name) { - GtkTextBuffer *buffer; - GtkTextTagTable *table; - GtkTextTag *tag; - GtkTextIter start, end, i; - gboolean all_tagged; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - table = gtk_text_buffer_get_tag_table (buffer); - tag = gtk_text_tag_table_lookup (table, name); - gtk_text_buffer_get_selection_bounds (buffer, &start, &end); - - if (!tag) - { - g_print ("Tag not found in table %p\n", (void *) table); - return; - } - - for (all_tagged = TRUE, i = start; !gtk_text_iter_equal (&i, &end); gtk_text_iter_forward_char (&i)) - { - if (!gtk_text_iter_has_tag (&i, tag)) - { - all_tagged = FALSE; - break; - } - } - - if (all_tagged) - gtk_text_buffer_remove_tag (buffer, tag, &start, &end); - else - gtk_text_buffer_apply_tag (buffer, tag, &start, &end); - - save_content (pad); + g_return_if_fail (pad->priv->textview); + XpadTextBuffer *buffer = NULL; + buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview))); + xpad_text_buffer_toggle_tag (buffer, name, pad); + xpad_save_content (pad); } static void menu_bold (XpadPad *pad) { - menu_toggle_tag (pad, "bold"); + menu_toggle_tag (pad, "bold"); } static void menu_italic (XpadPad *pad) { - menu_toggle_tag (pad, "italic"); + menu_toggle_tag (pad, "italic"); } static void menu_underline (XpadPad *pad) { - menu_toggle_tag (pad, "underline"); + menu_toggle_tag (pad, "underline"); } static void menu_strikethrough (XpadPad *pad) { - menu_toggle_tag (pad, "strikethrough"); + menu_toggle_tag (pad, "strikethrough"); } static void menu_sticky (XpadPad *pad, GtkCheckMenuItem *check) { - if (gtk_check_menu_item_get_active (check)) - gtk_window_stick (GTK_WINDOW (pad)); - else - gtk_window_unstick (GTK_WINDOW (pad)); + if (gtk_check_menu_item_get_active (check)) + gtk_window_stick (GTK_WINDOW (pad)); + else + gtk_window_unstick (GTK_WINDOW (pad)); } static void menu_toolbar (XpadPad *pad, GtkCheckMenuItem *check) { - xpad_settings_set_has_toolbar (xpad_settings (), gtk_check_menu_item_get_active (check)); + xpad_settings_set_has_toolbar (xpad_settings (), gtk_check_menu_item_get_active (check)); } static void menu_scrollbar (XpadPad *pad, GtkCheckMenuItem *check) { - xpad_settings_set_has_scrollbar (xpad_settings (), gtk_check_menu_item_get_active (check)); + xpad_settings_set_has_scrollbar (xpad_settings (), gtk_check_menu_item_get_active (check)); } static void menu_autohide (XpadPad *pad, GtkCheckMenuItem *check) { - xpad_settings_set_autohide_toolbar (xpad_settings (), gtk_check_menu_item_get_active (check)); + xpad_settings_set_autohide_toolbar (xpad_settings (), gtk_check_menu_item_get_active (check)); } static void menu_decorated (XpadPad *pad, GtkCheckMenuItem *check) { - xpad_settings_set_has_decorations (xpad_settings (), gtk_check_menu_item_get_active (check)); + xpad_settings_set_has_decorations (xpad_settings (), gtk_check_menu_item_get_active (check)); } static gint menu_title_compare (GtkWindow *a, GtkWindow *b) { - gchar *title_a = g_utf8_casefold (gtk_window_get_title (a), -1); - gchar *title_b = g_utf8_casefold (gtk_window_get_title (b), -1); - - gint rv = g_utf8_collate (title_a, title_b); - - g_free (title_a); - g_free (title_b); - - return rv; + gchar *title_a = g_utf8_casefold (gtk_window_get_title (a), -1); + gchar *title_b = g_utf8_casefold (gtk_window_get_title (b), -1); + + gint rv = g_utf8_collate (title_a, title_b); + + g_free (title_a); + g_free (title_b); + + return rv; } #define MENU_ADD(mnemonic, image, key, mask, callback) {\ - item = gtk_image_menu_item_new_with_mnemonic (mnemonic);\ - if (image) {\ - GtkWidget *imgwidget = gtk_image_new_from_stock (image, GTK_ICON_SIZE_MENU);\ - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), imgwidget);\ - }\ - g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\ - if (key)\ - gtk_widget_add_accelerator(item, "activate", accel_group, key, mask, GTK_ACCEL_VISIBLE);\ - gtk_container_add (GTK_CONTAINER (menu), item);\ - gtk_widget_show (item);\ - } + item = gtk_image_menu_item_new_with_mnemonic (mnemonic);\ + if (image) {\ + GtkWidget *imgwidget = gtk_image_new_from_stock (image, GTK_ICON_SIZE_MENU);\ + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), imgwidget);\ + }\ + g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\ + if (key)\ + gtk_widget_add_accelerator(item, "activate", accel_group, key, mask, GTK_ACCEL_VISIBLE);\ + gtk_container_add (GTK_CONTAINER (menu), item);\ + gtk_widget_show (item);\ + } #define MENU_ADD_STOCK(stock, callback) {\ - item = gtk_image_menu_item_new_from_stock (stock, accel_group);\ - g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\ - gtk_container_add (GTK_CONTAINER (menu), item);\ - gtk_widget_show (item);\ - } + item = gtk_image_menu_item_new_from_stock (stock, accel_group);\ + g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\ + gtk_container_add (GTK_CONTAINER (menu), item);\ + gtk_widget_show (item);\ + } + +#define MENU_ADD_STOCK_WITH_ACCEL(stock, callback, key, mask) {\ + item = gtk_image_menu_item_new_from_stock (stock, accel_group);\ + g_signal_connect_swapped (item, "activate", G_CALLBACK (callback), pad);\ + if (key)\ + gtk_widget_add_accelerator(item, "activate", accel_group, key, mask, GTK_ACCEL_VISIBLE);\ + gtk_container_add (GTK_CONTAINER (menu), item);\ + gtk_widget_show (item);\ + } #define MENU_ADD_CHECK(mnemonic, active, callback) {\ - item = gtk_check_menu_item_new_with_mnemonic (mnemonic);\ - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), active);\ - g_signal_connect_swapped (item, "toggled", G_CALLBACK (callback), pad);\ - gtk_container_add (GTK_CONTAINER (menu), item);\ - gtk_widget_show (item);\ - } + item = gtk_check_menu_item_new_with_mnemonic (mnemonic);\ + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), active);\ + g_signal_connect_swapped (item, "toggled", G_CALLBACK (callback), pad);\ + gtk_container_add (GTK_CONTAINER (menu), item);\ + gtk_widget_show (item);\ + } #define MENU_ADD_SEP() {\ - item = gtk_separator_menu_item_new ();\ - gtk_container_add (GTK_CONTAINER (menu), item);\ - gtk_widget_show (item);\ - } + item = gtk_separator_menu_item_new ();\ + gtk_container_add (GTK_CONTAINER (menu), item);\ + gtk_widget_show (item);\ + } static GtkWidget * menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group) { - GtkWidget *uppermenu, *menu, *item; - - uppermenu = gtk_menu_new (); - gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group); - - item = gtk_menu_item_new_with_mnemonic (_("_Pad")); - gtk_container_add (GTK_CONTAINER (uppermenu), item); - gtk_widget_show (item); - - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); - - MENU_ADD_STOCK (GTK_STOCK_NEW, xpad_pad_spawn); - MENU_ADD_SEP (); - MENU_ADD_CHECK (_("Show on _All Workspaces"), pad->priv->sticky, menu_sticky); - g_object_set_data (G_OBJECT (uppermenu), "sticky", item); - MENU_ADD_STOCK (GTK_STOCK_PROPERTIES, xpad_pad_open_properties); - MENU_ADD_SEP (); - MENU_ADD_STOCK (GTK_STOCK_CLOSE, xpad_pad_close); - MENU_ADD_STOCK (GTK_STOCK_DELETE, xpad_pad_delete); - - - item = gtk_menu_item_new_with_mnemonic (_("_Edit")); - gtk_container_add (GTK_CONTAINER (uppermenu), item); - gtk_widget_show (item); - - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); - - MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste); - g_object_set_data (G_OBJECT (uppermenu), "paste", item); - MENU_ADD_SEP (); - MENU_ADD_STOCK (GTK_STOCK_PREFERENCES, xpad_pad_open_preferences); - - - item = gtk_menu_item_new_with_mnemonic (_("_View")); - gtk_container_add (GTK_CONTAINER (uppermenu), item); - gtk_widget_show (item); - - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); - - MENU_ADD_CHECK (_("_Toolbar"), xpad_settings_get_has_toolbar (xpad_settings ()), menu_toolbar); - MENU_ADD_CHECK (_("_Autohide Toolbar"), xpad_settings_get_autohide_toolbar (xpad_settings ()), menu_autohide); - gtk_widget_set_sensitive (item, xpad_settings_get_has_toolbar (xpad_settings ())); - MENU_ADD_CHECK (_("_Scrollbar"), xpad_settings_get_has_scrollbar (xpad_settings ()), menu_scrollbar); - MENU_ADD_CHECK (_("_Window Decorations"), xpad_settings_get_has_decorations (xpad_settings ()), menu_decorated); - - - item = gtk_menu_item_new_with_mnemonic (_("_Notes")); - gtk_container_add (GTK_CONTAINER (uppermenu), item); - gtk_widget_show (item); - - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); - g_object_set_data (G_OBJECT (uppermenu), "notes-menu", menu); - - MENU_ADD (_("_Show All"), NULL, 0, 0, menu_show_all); - MENU_ADD (_("_Close All"), NULL, 0, 0, xpad_pad_close_all); - - /* The rest of the notes menu will get set up in the prep function below */ - - item = gtk_menu_item_new_with_mnemonic (_("_Help")); - gtk_container_add (GTK_CONTAINER (uppermenu), item); - gtk_widget_show (item); - - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); - - MENU_ADD (_("_Contents"), GTK_STOCK_HELP, GDK_F1, 0, show_help); - MENU_ADD (_("_About"), GTK_STOCK_ABOUT, 0, 0, menu_about); - - return uppermenu; + GtkWidget *uppermenu, *menu, *item; + + uppermenu = gtk_menu_new (); + gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group); + + item = gtk_menu_item_new_with_mnemonic (_("_Pad")); + gtk_container_add (GTK_CONTAINER (uppermenu), item); + gtk_widget_show (item); + + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + + MENU_ADD_STOCK (GTK_STOCK_NEW, xpad_pad_spawn); + MENU_ADD_SEP (); + MENU_ADD_CHECK (_("Show on _All Workspaces"), pad->priv->sticky, menu_sticky); + g_object_set_data (G_OBJECT (uppermenu), "sticky", item); + MENU_ADD_STOCK (GTK_STOCK_PROPERTIES, xpad_pad_open_properties); + MENU_ADD_SEP (); + MENU_ADD_STOCK (GTK_STOCK_CLOSE, xpad_pad_close); + MENU_ADD_STOCK (GTK_STOCK_DELETE, xpad_pad_delete); + + + item = gtk_menu_item_new_with_mnemonic (_("_Edit")); + gtk_container_add (GTK_CONTAINER (uppermenu), item); + gtk_widget_show (item); + + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + + MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_UNDO, menu_undo, GDK_Z, GDK_CONTROL_MASK); + g_object_set_data (G_OBJECT (uppermenu), "undo", item); + + MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_REDO, menu_redo, GDK_R, GDK_CONTROL_MASK); + g_object_set_data (G_OBJECT (uppermenu), "redo", item); + + MENU_ADD_SEP(); + + MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste); + g_object_set_data (G_OBJECT (uppermenu), "paste", item); + + MENU_ADD_SEP (); + + MENU_ADD_STOCK (GTK_STOCK_PREFERENCES, xpad_pad_open_preferences); + + + item = gtk_menu_item_new_with_mnemonic (_("_View")); + gtk_container_add (GTK_CONTAINER (uppermenu), item); + gtk_widget_show (item); + + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + + MENU_ADD_CHECK (_("_Toolbar"), xpad_settings_get_has_toolbar (xpad_settings ()), menu_toolbar); + MENU_ADD_CHECK (_("_Autohide Toolbar"), xpad_settings_get_autohide_toolbar (xpad_settings ()), menu_autohide); + gtk_widget_set_sensitive (item, xpad_settings_get_has_toolbar (xpad_settings ())); + MENU_ADD_CHECK (_("_Scrollbar"), xpad_settings_get_has_scrollbar (xpad_settings ()), menu_scrollbar); + MENU_ADD_CHECK (_("_Window Decorations"), xpad_settings_get_has_decorations (xpad_settings ()), menu_decorated); + + + item = gtk_menu_item_new_with_mnemonic (_("_Notes")); + gtk_container_add (GTK_CONTAINER (uppermenu), item); + gtk_widget_show (item); + + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + g_object_set_data (G_OBJECT (uppermenu), "notes-menu", menu); + + MENU_ADD (_("_Show All"), NULL, 0, 0, menu_show_all); + MENU_ADD (_("_Close All"), NULL, 0, 0, xpad_pad_close_all); + + /* The rest of the notes menu will get set up in the prep function below */ + + item = gtk_menu_item_new_with_mnemonic (_("_Help")); + gtk_container_add (GTK_CONTAINER (uppermenu), item); + gtk_widget_show (item); + + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + + MENU_ADD (_("_Contents"), GTK_STOCK_HELP, GDK_F1, 0, show_help); + MENU_ADD (_("_About"), GTK_STOCK_ABOUT, 0, 0, menu_about); + + return uppermenu; } static void menu_prep_popup_no_highlight (XpadPad *current_pad, GtkWidget *uppermenu) { - GtkWidget *menu, *item; - GtkClipboard *clipboard; - - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - - item = g_object_get_data (G_OBJECT (uppermenu), "paste"); - if (item) - gtk_widget_set_sensitive (item, gtk_clipboard_wait_is_text_available (clipboard)); - - item = g_object_get_data (G_OBJECT (uppermenu), "sticky"); - if (item) { - g_signal_handlers_block_by_func (item, menu_sticky, current_pad); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), current_pad->priv->sticky); - g_signal_handlers_unblock_by_func (item, menu_sticky, current_pad); - } - - menu = g_object_get_data (G_OBJECT (uppermenu), "notes-menu"); - if (menu) - { - gint n = 1; - gchar *key; - - /* Remove old menu */ - item = g_object_get_data (G_OBJECT (menu), "notes-sep"); - while (item) - { - gtk_container_remove (GTK_CONTAINER (menu), item); - key = g_strdup_printf ("notes-%i", n++); - item = g_object_get_data (G_OBJECT (menu), key); - g_free (key); - } - } - if (menu && current_pad->priv->group) - { - GSList *pads, *l; - gint n; - GtkAccelGroup *accel_group = gtk_menu_get_accel_group (GTK_MENU (uppermenu)); - - MENU_ADD_SEP (); - g_object_set_data (G_OBJECT (menu), "notes-sep", item); - - /** - * Order pads according to title. - */ - pads = xpad_pad_group_get_pads (current_pad->priv->group); - - pads = g_slist_sort (pads, (GCompareFunc) menu_title_compare); - - /** - * Populate list of windows. - */ - for (l = pads, n = 1; l; l = l->next, n++) - { - gchar *title; - gchar *tmp_title; - gchar *key; - GtkWidget *pad = GTK_WIDGET (l->data); - - key = g_strdup_printf ("notes-%i", n); - tmp_title = g_strdup (gtk_window_get_title (GTK_WINDOW (pad))); - str_replace_tokens (&tmp_title, '_', "__"); - if (n < 10) - title = g_strdup_printf ("_%i. %s", n, tmp_title); - else - title = g_strdup_printf ("%i. %s", n, tmp_title); - g_free (tmp_title); - - MENU_ADD (title, NULL, 0, 0, menu_show); - g_object_set_data (G_OBJECT (menu), key, item); - - g_free (title); - g_free (key); - } - g_slist_free (pads); - } + GtkWidget *menu, *item; + + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + + XpadTextBuffer *buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (current_pad->priv->textview))); + + item = g_object_get_data (G_OBJECT (uppermenu), "paste"); + if (item) + gtk_widget_set_sensitive (item, gtk_clipboard_wait_is_text_available (clipboard)); + + item = g_object_get_data (G_OBJECT (uppermenu), "undo"); + if (item) + gtk_widget_set_sensitive (item, xpad_text_buffer_undo_available (buffer)); + + item = g_object_get_data (G_OBJECT (uppermenu), "redo"); + if (item) + gtk_widget_set_sensitive (item, xpad_text_buffer_redo_available (buffer)); + + item = g_object_get_data (G_OBJECT (uppermenu), "sticky"); + if (item) { + g_signal_handlers_block_by_func (item, menu_sticky, current_pad); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), current_pad->priv->sticky); + g_signal_handlers_unblock_by_func (item, menu_sticky, current_pad); + } + + menu = g_object_get_data (G_OBJECT (uppermenu), "notes-menu"); + if (menu) + { + gint n = 1; + gchar *key; + + /* Remove old menu */ + item = g_object_get_data (G_OBJECT (menu), "notes-sep"); + while (item) + { + gtk_container_remove (GTK_CONTAINER (menu), item); + key = g_strdup_printf ("notes-%i", n++); + item = g_object_get_data (G_OBJECT (menu), key); + g_free (key); + } + } + if (menu && current_pad->priv->group) + { + GSList *pads, *l; + gint n; + GtkAccelGroup *accel_group = gtk_menu_get_accel_group (GTK_MENU (uppermenu)); + + MENU_ADD_SEP (); + g_object_set_data (G_OBJECT (menu), "notes-sep", item); + + /** + * Order pads according to title. + */ + pads = xpad_pad_group_get_pads (current_pad->priv->group); + + pads = g_slist_sort (pads, (GCompareFunc) menu_title_compare); + + /** + * Populate list of windows. + */ + for (l = pads, n = 1; l; l = l->next, n++) + { + gchar *title; + gchar *tmp_title; + gchar *key; + GtkWidget *pad = GTK_WIDGET (l->data); + + key = g_strdup_printf ("notes-%i", n); + tmp_title = g_strdup (gtk_window_get_title (GTK_WINDOW (pad))); + str_replace_tokens (&tmp_title, '_', "__"); + if (n < 10) + title = g_strdup_printf ("_%i. %s", n, tmp_title); + else + title = g_strdup_printf ("%i. %s", n, tmp_title); + g_free (tmp_title); + + MENU_ADD (title, NULL, 0, 0, menu_show); + g_object_set_data (G_OBJECT (menu), key, item); + + g_free (title); + g_free (key); + } + g_slist_free (pads); + } } static GtkWidget * menu_get_popup_highlight (XpadPad *pad, GtkAccelGroup *accel_group) { - GtkWidget *menu, *item; - - menu = gtk_menu_new (); - gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); - - MENU_ADD_STOCK (GTK_STOCK_CUT, menu_cut); - MENU_ADD_STOCK (GTK_STOCK_COPY, menu_copy); - MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste); - g_object_set_data (G_OBJECT (menu), "paste", item); - MENU_ADD_SEP (); - MENU_ADD_STOCK (GTK_STOCK_BOLD, menu_bold); - MENU_ADD_STOCK (GTK_STOCK_ITALIC, menu_italic); - MENU_ADD_STOCK (GTK_STOCK_UNDERLINE, menu_underline); - MENU_ADD_STOCK (GTK_STOCK_STRIKETHROUGH, menu_strikethrough); - - return menu; + GtkWidget *menu, *item; + + menu = gtk_menu_new (); + gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); + + MENU_ADD_STOCK (GTK_STOCK_CUT, menu_cut); + MENU_ADD_STOCK (GTK_STOCK_COPY, menu_copy); + MENU_ADD_STOCK (GTK_STOCK_PASTE, menu_paste); + g_object_set_data (G_OBJECT (menu), "paste", item); + MENU_ADD_SEP (); + MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_BOLD, menu_bold, GDK_b, GDK_CONTROL_MASK); + MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_ITALIC, menu_italic, GDK_i, GDK_CONTROL_MASK); + MENU_ADD_STOCK_WITH_ACCEL (GTK_STOCK_UNDERLINE, menu_underline, GDK_u, GDK_CONTROL_MASK); + MENU_ADD_STOCK (GTK_STOCK_STRIKETHROUGH, menu_strikethrough); + + return menu; } static void menu_prep_popup_highlight (XpadPad *pad, GtkWidget *menu) { - GtkWidget *item; - GtkClipboard *clipboard; - - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - - item = g_object_get_data (G_OBJECT (menu), "paste"); - if (item) - gtk_widget_set_sensitive (item, gtk_clipboard_wait_is_text_available (clipboard)); + GtkWidget *item; + GtkClipboard *clipboard; + + clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + + item = g_object_get_data (G_OBJECT (menu), "paste"); + if (item) + gtk_widget_set_sensitive (item, gtk_clipboard_wait_is_text_available (clipboard)); } static void menu_popup (GtkWidget *menu, XpadPad *pad) { - g_signal_handlers_block_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL); - pad->priv->toolbar_timeout = 0; + g_signal_handlers_block_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL); + pad->priv->toolbar_timeout = 0; } static void menu_popdown (GtkWidget *menu, XpadPad *pad) { - GdkRectangle rect; - - g_signal_handlers_unblock_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL); - - /** - * We must check if we disabled off of pad and start the timeout if so. - */ - gdk_window_get_pointer (GTK_WIDGET (pad)->window, &rect.x, &rect.y, NULL); - rect.width = 1; - rect.height = 1; - - if (!pad->priv->toolbar_timeout && - !gtk_widget_intersect (GTK_WIDGET (pad), &rect, NULL)) - pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); + GdkRectangle rect; + + g_signal_handlers_unblock_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL); + + /** + * We must check if we disabled off of pad and start the timeout if so. + */ + gdk_window_get_pointer (GTK_WIDGET (pad)->window, &rect.x, &rect.y, NULL); + rect.width = 1; + rect.height = 1; + + if (!pad->priv->toolbar_timeout && + !gtk_widget_intersect (GTK_WIDGET (pad), &rect, NULL)) + pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad); } static void xpad_pad_popup_deactivate (GtkWidget *menu, XpadPad *pad) { - menu_popdown (GTK_WIDGET (menu), pad); + menu_popdown (GTK_WIDGET (menu), pad); } static void xpad_pad_toolbar_popup (GtkWidget *toolbar, GtkMenu *menu, XpadPad *pad) { - menu_popup (GTK_WIDGET (menu), pad); + menu_popup (GTK_WIDGET (menu), pad); } static void xpad_pad_toolbar_popdown (GtkWidget *toolbar, GtkMenu *menu, XpadPad *pad) { - menu_popdown (GTK_WIDGET (menu), pad); + menu_popdown (GTK_WIDGET (menu), pad); } static void xpad_pad_popup (XpadPad *pad, GdkEventButton *event) { - GtkTextBuffer *buffer; - GtkWidget *menu; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); - - if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL)) - { - menu = pad->priv->highlight_menu; - menu_prep_popup_highlight (pad, menu); - } - else - { - menu = pad->priv->menu; - menu_prep_popup_no_highlight (pad, menu); - } - - if (!menu) - return; - - menu_popup (GTK_WIDGET (menu), pad); - - if (event) - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); - else - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ()); + GtkTextBuffer *buffer; + GtkWidget *menu; + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)); + + if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL)) + { + menu = pad->priv->highlight_menu; + menu_prep_popup_highlight (pad, menu); + } + else + { + menu = pad->priv->menu; + menu_prep_popup_no_highlight (pad, menu); + } + + if (!menu) + return; + + menu_popup (GTK_WIDGET (menu), pad); + + if (event) + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); + else + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ()); } diff -Nru xpad-4.0/src/xpad-pad.h xpad-4.1/src/xpad-pad.h --- xpad-4.0/src/xpad-pad.h 2009-05-11 01:43:20.000000000 +0000 +++ xpad-4.1/src/xpad-pad.h 2011-11-15 17:17:05.000000000 +0000 @@ -2,6 +2,7 @@ Copyright (c) 2001-2007 Michael Terry Copyright (c) 2009 Paul Ivanov +Copyright (c) 2011 Sergei Riaguzov This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,16 +41,16 @@ struct XpadPad { - /* private */ - GtkWindow parent; - XpadPadPrivate *priv; + /* private */ + GtkWindow parent; + XpadPadPrivate *priv; }; struct XpadPadClass { - GtkWindowClass parent_class; - - void (*closed) (XpadPad *pad); + GtkWindowClass parent_class; + + void (*closed) (XpadPad *pad); }; GType xpad_pad_get_type (void); @@ -61,6 +62,9 @@ void xpad_pad_toggle (XpadPad *pad); void xpad_pad_save_info (XpadPad *pad); +void xpad_load_content (XpadPad *pad); +void xpad_save_content (XpadPad *pad); + G_END_DECLS #endif /* __XPAD_PAD_H__ */ diff -Nru xpad-4.0/src/xpad-text-buffer.c xpad-4.1/src/xpad-text-buffer.c --- xpad-4.0/src/xpad-text-buffer.c 2008-09-28 01:44:10.000000000 +0000 +++ xpad-4.1/src/xpad-text-buffer.c 2011-11-15 17:17:05.000000000 +0000 @@ -1,5 +1,6 @@ /** * Copyright (c) 2004-2007 Michael Terry + * Copyright (c) 2011 Sergei Riaguzov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +18,16 @@ */ #include "xpad-text-buffer.h" +#include "xpad-undo.h" G_DEFINE_TYPE(XpadTextBuffer, xpad_text_buffer, GTK_TYPE_TEXT_BUFFER) +#define XPAD_TEXT_BUFFER_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_TEXT_BUFFER, XpadTextBufferPrivate)) + +struct XpadTextBufferPrivate +{ + /* undo */ + XpadUndo *undo; +}; /* Unicode chars in the Private Use Area. */ static gunichar TAG_CHAR = 0xe000; @@ -37,13 +46,31 @@ } static void +xpad_text_buffer_finalize (GObject *object) +{ + XpadTextBuffer *text_buffer = XPAD_TEXT_BUFFER (object); + + g_free (text_buffer->priv->undo); + + G_OBJECT_CLASS (xpad_text_buffer_parent_class)->finalize (object); +} + +static void xpad_text_buffer_class_init (XpadTextBufferClass *klass) { + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->finalize = xpad_text_buffer_finalize; + + g_type_class_add_private (gobject_class, sizeof (XpadTextBufferPrivate)); } static void xpad_text_buffer_init (XpadTextBuffer *buffer) { + buffer->priv = XPAD_TEXT_BUFFER_GET_PRIVATE (buffer); + + buffer->priv->undo = xpad_undo_new (buffer); } void @@ -164,6 +191,74 @@ return text; } +void +xpad_text_buffer_insert_text (XpadTextBuffer *buffer, gint pos, const gchar *text, gint len) +{ + GtkTextBuffer *parent = (GtkTextBuffer*) buffer; + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset (parent, &iter, pos); + gtk_text_buffer_insert (parent, &iter, text, len); + gtk_text_buffer_place_cursor (parent, &iter); +} + +void +xpad_text_buffer_delete_range (XpadTextBuffer *buffer, gint start, gint end) +{ + GtkTextBuffer *parent = (GtkTextBuffer*) buffer; + + GtkTextIter start_iter; + GtkTextIter end_iter; + + gtk_text_buffer_get_iter_at_offset (parent, &start_iter, start); + + if (end < 0) + gtk_text_buffer_get_end_iter (parent, &end_iter); + else + gtk_text_buffer_get_iter_at_offset (parent, &end_iter, end); + + gtk_text_buffer_place_cursor (parent, &start_iter); + gtk_text_buffer_delete (parent, &start_iter, &end_iter); +} + +void +xpad_text_buffer_toggle_tag (XpadTextBuffer *buffer, const gchar *name, XpadPad *pad) +{ + GtkTextTagTable *table; + GtkTextTag *tag; + GtkTextIter start, end, i; + gboolean all_tagged; + + table = gtk_text_buffer_get_tag_table ( GTK_TEXT_BUFFER (buffer)); + tag = gtk_text_tag_table_lookup (table, name); + gtk_text_buffer_get_selection_bounds ( GTK_TEXT_BUFFER (buffer), &start, &end); + + if (!tag) + { + g_print ("Tag not found in table %p\n", (void *) table); + return; + } + + for (all_tagged = TRUE, i = start; !gtk_text_iter_equal (&i, &end); gtk_text_iter_forward_char (&i)) + { + if (!gtk_text_iter_has_tag (&i, tag)) + { + all_tagged = FALSE; + break; + } + } + + if (all_tagged) + { + gtk_text_buffer_remove_tag ( GTK_TEXT_BUFFER (buffer), tag, &start, &end); + xpad_undo_remove_tag (buffer->priv->undo, name, &start, &end, pad); + } + else + { + gtk_text_buffer_apply_tag ( GTK_TEXT_BUFFER (buffer), tag, &start, &end); + xpad_undo_apply_tag (buffer->priv->undo, name, &start, &end, pad); + } +} + static GtkTextTagTable * create_tag_table (void) { @@ -218,3 +313,38 @@ return table; } + +gboolean +xpad_text_buffer_undo_available (XpadTextBuffer *buffer) +{ + return xpad_undo_undo_available (buffer->priv->undo); +} + +gboolean +xpad_text_buffer_redo_available (XpadTextBuffer *buffer) +{ + return xpad_undo_redo_available (buffer->priv->undo); +} + +void +xpad_text_buffer_undo (XpadTextBuffer *buffer) +{ + xpad_undo_exec_undo (buffer->priv->undo); +} + +void +xpad_text_buffer_redo (XpadTextBuffer *buffer) +{ + xpad_undo_exec_redo (buffer->priv->undo); +} + +void xpad_text_buffer_freeze_undo (XpadTextBuffer *buffer) +{ + xpad_undo_freeze (buffer->priv->undo); +} + +void xpad_text_buffer_thaw_undo (XpadTextBuffer *buffer) +{ + xpad_undo_thaw (buffer->priv->undo); +} + diff -Nru xpad-4.0/src/xpad-text-buffer.h xpad-4.1/src/xpad-text-buffer.h --- xpad-4.0/src/xpad-text-buffer.h 2008-09-28 01:44:10.000000000 +0000 +++ xpad-4.1/src/xpad-text-buffer.h 2011-11-15 17:17:05.000000000 +0000 @@ -1,5 +1,6 @@ /** * Copyright (c) 2004-2007 Michael Terry + * Copyright (c) 2011 Sergei Riaguzov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +21,7 @@ #define __XPAD_TEXT_BUFFER_H__ #include +#include "xpad-pad.h" G_BEGIN_DECLS @@ -31,11 +33,15 @@ #define XPAD_TEXT_BUFFER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XPAD_TYPE_TEXT_BUFFER, XpadTextBufferClass)) typedef struct XpadTextBufferClass XpadTextBufferClass; +typedef struct XpadTextBufferPrivate XpadTextBufferPrivate; typedef struct XpadTextBuffer XpadTextBuffer; struct XpadTextBuffer { GtkTextBuffer parent; + + /* private */ + XpadTextBufferPrivate *priv; }; struct XpadTextBufferClass @@ -50,6 +56,17 @@ void xpad_text_buffer_set_text_with_tags (XpadTextBuffer *buffer, const gchar *text); gchar *xpad_text_buffer_get_text_with_tags (XpadTextBuffer *buffer); +void xpad_text_buffer_insert_text (XpadTextBuffer *buffer, gint pos, const gchar *text, gint len); +void xpad_text_buffer_delete_range (XpadTextBuffer *buffer, gint start, gint end); +void xpad_text_buffer_toggle_tag (XpadTextBuffer *buffer, const gchar *name, XpadPad *pad); + +gboolean xpad_text_buffer_undo_available (XpadTextBuffer *buffer); +gboolean xpad_text_buffer_redo_available (XpadTextBuffer *buffer); +void xpad_text_buffer_undo (XpadTextBuffer *buffer); +void xpad_text_buffer_redo (XpadTextBuffer *buffer); +void xpad_text_buffer_freeze_undo (XpadTextBuffer *buffer); +void xpad_text_buffer_thaw_undo (XpadTextBuffer *buffer); + G_END_DECLS #endif /* __XPAD_TEXT_BUFFER_H__ */ diff -Nru xpad-4.0/src/xpad-undo.c xpad-4.1/src/xpad-undo.c --- xpad-4.0/src/xpad-undo.c 1970-01-01 00:00:00.000000000 +0000 +++ xpad-4.1/src/xpad-undo.c 2011-11-15 17:17:05.000000000 +0000 @@ -0,0 +1,591 @@ +/* + +Copyright (c) 2001-2007 Michael Terry +Copyright (c) 2010 Sergei Riaguzov + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + + +#include "../config.h" +#include +#include +#include +#include "xpad-undo.h" +#include "xpad-text-buffer.h" + +G_DEFINE_TYPE(XpadUndo, xpad_undo, G_TYPE_OBJECT) +#define XPAD_UNDO_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XPAD_TYPE_UNDO, XpadUndoPrivate)) + +static GObject* xpad_undo_constructor(GType gtype, guint n_properties, GObjectConstructParam *properties); +static void xpad_undo_dispose (GObject *object); +static void xpad_undo_finalize (GObject *object); +static void xpad_undo_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void xpad_undo_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); + +enum UserActionType +{ + USER_ACTION_INSERT_TEXT, + USER_ACTION_DELETE_RANGE, + USER_ACTION_APPLY_TAG, + USER_ACTION_REMOVE_TAG +}; + +typedef struct +{ + enum UserActionType action_type; + gint start; + gint end; + gchar *text; + gboolean merged; + union { + XpadPad *pad; // this is for USER_ACTION_APPLY_TAG, USER_ACTION_REMOVE_TAG + struct { // this is for USER_ACTION_INSERT_TEXT, USER_ACTION_DELETE_RANGE + gint len_in_bytes; + gint n_utf8_chars; + }; + }; +} UserAction; + +static GList* xpad_undo_remove_action_elem (GList *curr); +static void xpad_undo_clear_redo_history (XpadUndo *undo); +static void xpad_undo_clear_history (XpadUndo *undo); +static void xpad_undo_begin_user_action (GtkTextBuffer *buffer, XpadUndo *undo); +static void xpad_undo_end_user_action (GtkTextBuffer *buffer, XpadUndo *undo); +static void xpad_undo_insert_text (GtkTextBuffer *buffer, GtkTextIter *location, gchar *text, gint len, XpadUndo *undo); +static void xpad_undo_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, XpadUndo *undo); + +struct XpadUndoPrivate +{ + XpadTextBuffer *buffer; + /* We always redo the next element in the list but undo the current one. + We insert this guard with NULL data in the beginning to ease coding all of this */ + GList *history_start; + GList *history_curr; + guint user_action; + gboolean frozen; +}; + +enum +{ + PROP_0, + PROP_BUFFER, + LAST_PROP +}; + +XpadUndo* +xpad_undo_new (XpadTextBuffer *buffer) +{ + return XPAD_UNDO (g_object_new (XPAD_TYPE_UNDO, "buffer", buffer, NULL)); +} + +static void +xpad_undo_class_init (XpadUndoClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + /* TODO: neither dispose nor finalize neither in here nor in xpad-pad.c are + actually called, have to fix cleaning up */ + gobject_class->dispose = xpad_undo_dispose; + gobject_class->finalize = xpad_undo_finalize; + gobject_class->set_property = xpad_undo_set_property; + gobject_class->get_property = xpad_undo_get_property; + gobject_class->constructor = xpad_undo_constructor; + + g_object_class_install_property (gobject_class, + PROP_BUFFER, + g_param_spec_pointer ("buffer", + "Pad Buffer", + "Pad buffer connected to this undo", + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + + g_type_class_add_private (gobject_class, sizeof (XpadUndoPrivate)); +} + + +static void +xpad_undo_init (XpadUndo *undo) +{ + undo->priv = XPAD_UNDO_GET_PRIVATE (undo); + + undo->priv->buffer = NULL; + undo->priv->history_start = g_list_append (NULL, NULL); + undo->priv->history_curr = undo->priv->history_start; + undo->priv->user_action = 0; + undo->priv->frozen = FALSE; +} + +static GObject* +xpad_undo_constructor(GType gtype, guint n_properties, GObjectConstructParam *properties) +{ + GObjectClass *parent_class = G_OBJECT_CLASS (xpad_undo_parent_class); + GObject *obj = parent_class->constructor (gtype, n_properties, properties); + + XpadUndo *undo = XPAD_UNDO (obj); + + /* Assert user passed buffer as construct parameter */ + gint i; + gboolean found_buffer = FALSE; + for (i = 0; i < n_properties; i++) + { + if (!g_strcmp0 (properties[i].pspec->name, "buffer") && + G_VALUE_HOLDS_POINTER (properties[i].value) && + G_IS_OBJECT (g_value_get_pointer (properties[i].value))) + { + found_buffer = TRUE; + } + } + + if (!found_buffer) + { + undo->priv->buffer = NULL; + g_warning ("GtkTextBuffer is not passed to XpadUndo constructor, undo will not work!\n"); + } + else + { + /* Set up signals */ + g_signal_connect (G_OBJECT (undo->priv->buffer), "insert-text", G_CALLBACK (xpad_undo_insert_text), undo); + g_signal_connect (G_OBJECT (undo->priv->buffer), "delete-range", G_CALLBACK (xpad_undo_delete_range), undo); + g_signal_connect (G_OBJECT (undo->priv->buffer), "begin-user-action", G_CALLBACK (xpad_undo_begin_user_action), undo); + g_signal_connect (G_OBJECT (undo->priv->buffer), "end-user-action", G_CALLBACK (xpad_undo_end_user_action), undo); + } + + return obj; +} + +static void +xpad_undo_dispose (GObject *object) +{ + XpadUndo *undo = XPAD_UNDO (object); + + if (undo->priv->buffer && G_IS_OBJECT (undo->priv->buffer)) + { + g_object_unref (undo->priv->buffer); + undo->priv->buffer = NULL; + } + + G_OBJECT_CLASS (xpad_undo_parent_class)->dispose (object); +} + +static void +xpad_undo_finalize (GObject *object) +{ + XpadUndo *undo = XPAD_UNDO (object); + + /* remove all elements except for the left guard */ + xpad_undo_clear_history (undo); + + /* remove left guard */ + g_list_free (undo->priv->history_start); + + G_OBJECT_CLASS (xpad_undo_parent_class)->finalize (object); +} + +static void +xpad_undo_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + XpadUndo *undo = XPAD_UNDO (object); + + switch (prop_id) + { + case PROP_BUFFER: + if (undo->priv->buffer && G_IS_OBJECT (undo->priv->buffer)) + g_object_unref (undo->priv->buffer); + if (G_VALUE_HOLDS_POINTER (value) && G_IS_OBJECT (g_value_get_pointer (value))) + { + undo->priv->buffer = g_value_get_pointer (value); + g_object_ref (undo->priv->buffer); + } + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +xpad_undo_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + XpadUndo *undo = XPAD_UNDO (object); + + switch (prop_id) + { + case PROP_BUFFER: + g_value_set_pointer (value, undo->priv->buffer); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +xpad_undo_begin_user_action (GtkTextBuffer *buffer, XpadUndo *undo) +{ + undo->priv->user_action++; +} + +static void +xpad_undo_end_user_action (GtkTextBuffer *buffer, XpadUndo *undo) +{ + if (undo->priv->user_action > 0) + undo->priv->user_action--; +} + +/* Removes current element and returns a pointer to the previous */ +static GList* +xpad_undo_remove_action_elem (GList *curr) +{ + if (curr->data) + { + UserAction *action = curr->data; + g_free (action->text); + g_free (action); + if (curr->prev) + curr->prev->next = curr->next; + if (curr->next) + curr->next->prev = curr->prev; + GList *new_curr = curr->prev; + curr->prev = NULL; + curr->next = NULL; + g_list_free (curr); + curr = new_curr; + } + return curr; +} + +/* Redo is impossible after text insertion/deletion, only right after Undo (another Redo), + so we have to remove every history entry after the current one if there is any */ +static void +xpad_undo_clear_redo_history (XpadUndo *undo) +{ + while (undo->priv->history_curr->next) + xpad_undo_remove_action_elem (undo->priv->history_curr->next); +} + +static void +xpad_undo_clear_history (XpadUndo *undo) +{ + while (undo->priv->history_start->next) + xpad_undo_remove_action_elem (undo->priv->history_start->next); + undo->priv->history_curr = undo->priv->history_start; +} + +static void +xpad_undo_insert_text (GtkTextBuffer *buffer, GtkTextIter *location, gchar *text, gint len, XpadUndo *undo) +{ + if (undo->priv->frozen) + return; + + if (undo->priv->user_action) + { + xpad_undo_clear_redo_history (undo); + + gint pos = gtk_text_iter_get_offset (location); + gint n_utf8_chars = g_utf8_strlen (text, len); + + /* Merge similar actions. This is how Undo works in most editors, if there is a series of + 1-letter insertions - they are merge for Undo */ + if (undo->priv->history_curr->data) + { + UserAction *prev_action = undo->priv->history_curr->data; + + if (prev_action->action_type == USER_ACTION_INSERT_TEXT) + { + /* series of 1-letter insertions */ + if (n_utf8_chars == 1 // this is a 1-letter insertion + && pos == prev_action->end // placed right after the previous text + && (prev_action->n_utf8_chars == 1 || prev_action->merged)) // with which we should merge + { + /* if there was a space stop merging unless that was a series of spaces */ + if ((!g_unichar_isspace (prev_action->text[0]) && !g_ascii_isspace (text[0])) || + (g_unichar_isspace (prev_action->text[0]) && g_unichar_isspace (text[0]))) + { + gchar *joined_str = g_strjoin (NULL, prev_action->text, text, NULL); + g_free (prev_action->text); + prev_action->text = joined_str; + prev_action->len_in_bytes += len; + prev_action->end += len; + prev_action->n_utf8_chars += n_utf8_chars; + prev_action->merged = TRUE; + return; + } + } + } + } + + UserAction *action = g_new (UserAction, 1); + action->action_type = USER_ACTION_INSERT_TEXT; + action->text = g_strdup (text); + action->start = pos; + action->end = pos + len; + action->len_in_bytes = abs (action->end - action->start); + action->n_utf8_chars = n_utf8_chars; + action->merged = FALSE; + + /* since each operation clears redo we know that there + is nothing after history_curr at this point so we + insert right after it. history_start won't change + since it is a left guard - not NULL */ + GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start + undo->priv->history_curr = g_list_next (undo->priv->history_curr); + } +} + +static void +xpad_undo_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, XpadUndo *undo) +{ + if (undo->priv->frozen) + return; + + if (undo->priv->user_action) + { + xpad_undo_clear_redo_history (undo); + + gchar *text = gtk_text_iter_get_text (start, end); + gint start_offset = gtk_text_iter_get_offset (start); + gint end_offset = gtk_text_iter_get_offset (end); + gint len = abs (end_offset - start_offset); + gint n_utf8_chars = g_utf8_strlen (text, len); + + UserAction *action = g_new (UserAction, 1); + action->action_type = USER_ACTION_DELETE_RANGE; + action->text = g_strdup (text); + action->start = start_offset; + action->end = end_offset; + action->len_in_bytes = len; + action->n_utf8_chars = n_utf8_chars; + action->merged = FALSE; + + GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start + undo->priv->history_curr = g_list_next (undo->priv->history_curr); + } +} + +void +xpad_undo_apply_tag (XpadUndo *undo, const gchar *name, GtkTextIter *start, GtkTextIter *end, XpadPad *pad) +{ + if (undo->priv->frozen) + return; + + xpad_undo_clear_redo_history (undo); + + gint start_offset = gtk_text_iter_get_offset (start); + gint end_offset = gtk_text_iter_get_offset (end); + + UserAction *action = g_new (UserAction, 1); + action->action_type = USER_ACTION_APPLY_TAG; + action->text = g_strdup (name); + action->start = start_offset; + action->end = end_offset; + action->pad = pad; + action->merged = FALSE; + + GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start + undo->priv->history_curr = g_list_next (undo->priv->history_curr); +} + +void +xpad_undo_remove_tag (XpadUndo *undo, const gchar *name, GtkTextIter *start, GtkTextIter *end, XpadPad *pad) +{ + if (undo->priv->frozen) + return; + + xpad_undo_clear_redo_history (undo); + + gint start_offset = gtk_text_iter_get_offset (start); + gint end_offset = gtk_text_iter_get_offset (end); + + UserAction *action = g_new (UserAction, 1); + action->action_type = USER_ACTION_REMOVE_TAG; + action->text = g_strdup (name); + action->start = start_offset; + action->end = end_offset; + action->pad = pad; + action->merged = FALSE; + + GList *dummy_start = g_list_append (undo->priv->history_curr, action); // supress warning, we have left guard for start + undo->priv->history_curr = g_list_next (undo->priv->history_curr); +} + +gboolean +xpad_undo_undo_available (XpadUndo *undo) +{ + if (undo->priv->frozen) + return FALSE; + + /* No undo without buffer */ + if (undo->priv->buffer == NULL || !G_IS_OBJECT (undo->priv->buffer)) + return FALSE; + + if (undo->priv->history_curr->data) + return TRUE; + else + return FALSE; +} + +gboolean +xpad_undo_redo_available (XpadUndo *undo) +{ + if (undo->priv->frozen) + return FALSE; + + /* No redo without buffer */ + if (undo->priv->buffer == NULL || !G_IS_OBJECT (undo->priv->buffer)) + return FALSE; + + if (undo->priv->history_curr->next && undo->priv->history_curr->next->data) + return TRUE; + else + return FALSE; +} + +static void +xpad_undo_get_start_end_iter (XpadUndo *undo, UserAction *action, GtkTextIter *start, GtkTextIter *end) +{ + gtk_text_buffer_get_iter_at_offset ( GTK_TEXT_BUFFER (undo->priv->buffer), + start, action->start); + + gtk_text_buffer_get_iter_at_offset ( GTK_TEXT_BUFFER (undo->priv->buffer), + end, action->end); +} + +void +xpad_undo_exec_undo (XpadUndo *undo) +{ + if (!xpad_undo_undo_available (undo)) + return; + + UserAction *action = undo->priv->history_curr->data; + + GtkTextTagTable *table = gtk_text_buffer_get_tag_table ( GTK_TEXT_BUFFER (undo->priv->buffer)); + + GtkTextIter start; + GtkTextIter end; + xpad_undo_get_start_end_iter (undo, action, &start, &end); + + switch (action->action_type) + { + case USER_ACTION_INSERT_TEXT: + { + xpad_text_buffer_delete_range (undo->priv->buffer, + action->start, + action->end); + } + break; + case USER_ACTION_DELETE_RANGE: + { + xpad_text_buffer_insert_text (undo->priv->buffer, + action->start, + action->text, + action->len_in_bytes); + } + break; + case USER_ACTION_APPLY_TAG: + { + GtkTextTag *tag = gtk_text_tag_table_lookup (table, action->text); + gtk_text_buffer_remove_tag ( GTK_TEXT_BUFFER (undo->priv->buffer), + tag, + &start, + &end); + xpad_save_content(action->pad); + } + break; + case USER_ACTION_REMOVE_TAG: + { + GtkTextTag *tag = gtk_text_tag_table_lookup (table, action->text); + gtk_text_buffer_apply_tag ( GTK_TEXT_BUFFER (undo->priv->buffer), + tag, + &start, + &end); + xpad_save_content(action->pad); + } + break; + } + + undo->priv->history_curr = g_list_previous (undo->priv->history_curr); +} + +void +xpad_undo_exec_redo (XpadUndo *undo) +{ + if (!xpad_undo_redo_available (undo)) + return; + + UserAction *action = undo->priv->history_curr->next->data; + + GtkTextTagTable *table = gtk_text_buffer_get_tag_table ( GTK_TEXT_BUFFER (undo->priv->buffer)); + + GtkTextIter start; + GtkTextIter end; + xpad_undo_get_start_end_iter (undo, action, &start, &end); + + switch (action->action_type) + { + case USER_ACTION_DELETE_RANGE: + { + xpad_text_buffer_delete_range (undo->priv->buffer, + action->start, + action->end); + } + break; + case USER_ACTION_INSERT_TEXT: + { + xpad_text_buffer_insert_text (undo->priv->buffer, + action->start, + action->text, + action->len_in_bytes); + } + break; + case USER_ACTION_APPLY_TAG: + { + GtkTextTag *tag = gtk_text_tag_table_lookup (table, action->text); + gtk_text_buffer_apply_tag ( GTK_TEXT_BUFFER (undo->priv->buffer), + tag, + &start, + &end); + xpad_save_content(action->pad); + } + break; + case USER_ACTION_REMOVE_TAG: + { + GtkTextTag *tag = gtk_text_tag_table_lookup (table, action->text); + gtk_text_buffer_remove_tag ( GTK_TEXT_BUFFER (undo->priv->buffer), + tag, + &start, + &end); + xpad_save_content(action->pad); + } + break; + } + + undo->priv->history_curr = g_list_next (undo->priv->history_curr); +} + +void +xpad_undo_freeze (XpadUndo *undo) +{ + undo->priv->frozen = TRUE; +} + +void +xpad_undo_thaw (XpadUndo *undo) +{ + undo->priv->frozen = FALSE; +} + diff -Nru xpad-4.0/src/xpad-undo.h xpad-4.1/src/xpad-undo.h --- xpad-4.0/src/xpad-undo.h 1970-01-01 00:00:00.000000000 +0000 +++ xpad-4.1/src/xpad-undo.h 2011-11-15 17:17:05.000000000 +0000 @@ -0,0 +1,70 @@ +/* + +Copyright (c) 2001-2007 Michael Terry +Copyright (c) 2010 Sergei Riaguzov + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +#ifndef __XPAD_UNDO_H__ +#define __XPAD_UNDO_H__ + +#include +#include "xpad-text-buffer.h" +#include "xpad-pad.h" + +G_BEGIN_DECLS + +#define XPAD_TYPE_UNDO (xpad_undo_get_type ()) +#define XPAD_UNDO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XPAD_TYPE_UNDO, XpadUndo)) +#define XPAD_UNDO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), XPAD_TYPE_UNDO, XpadUndoClass)) +#define XPAD_IS_UNDO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XPAD_TYPE_UNDO)) +#define XPAD_IS_UNDO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XPAD_TYPE_UNDO)) +#define XPAD_UNDO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XPAD_TYPE_UNDO, XpadUndoClass)) + +typedef struct XpadUndoClass XpadUndoClass; +typedef struct XpadUndoPrivate XpadUndoPrivate; +typedef struct XpadUndo XpadUndo; + +struct XpadUndo +{ + GObject parent; + + /* private */ + XpadUndoPrivate *priv; +}; + +struct XpadUndoClass +{ + GObjectClass parent_class; +}; + +GType xpad_undo_get_type (void); + +XpadUndo* xpad_undo_new (XpadTextBuffer *buffer); +gboolean xpad_undo_undo_available (XpadUndo *undo); +gboolean xpad_undo_redo_available (XpadUndo *undo); +void xpad_undo_exec_undo (XpadUndo *undo); +void xpad_undo_exec_redo (XpadUndo *undo); +void xpad_undo_freeze (XpadUndo *undo); +void xpad_undo_thaw (XpadUndo *undo); + +void xpad_undo_apply_tag (XpadUndo *undo, const gchar *name, GtkTextIter *start, GtkTextIter *end, XpadPad *pad); +void xpad_undo_remove_tag (XpadUndo *undo, const gchar *name, GtkTextIter *start, GtkTextIter *end, XpadPad *pad); + +G_END_DECLS + +#endif /* __XPAD_UNDO_H__ */