Hello, i want to know if it is still possible to upload a bugfix-only-release of Docky to sid/squeeze? Attached debdiff: debdiff docky_2.0.5-1.dsc docky_2.0.6-1.dsc | filterdiff -x "*.po*" > desktop/docky-206-debian-trimmed.debdiff Source repository: http://git.debian.org/?p=pkg-cli-apps/packages/docky.git Best regards, Rico Tzschichholz
diff -Nru docky-2.0.5/aclocal.m4 docky-2.0.6/aclocal.m4 --- docky-2.0.5/aclocal.m4 2010-07-01 19:05:30.625184001 +0200 +++ docky-2.0.6/aclocal.m4 2010-09-01 08:10:50.627532008 +0200 @@ -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.65],, -[m4_warning([this file was generated for autoconf 2.65. +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'.])]) @@ -346,7 +346,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. + dnl in configure.ac. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -475,7 +475,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_in,[],[ +ifdef(glib_configure_ac,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -691,8 +691,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. @@ -710,17 +711,17 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 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 -*- diff -Nru docky-2.0.5/configure docky-2.0.6/configure --- docky-2.0.5/configure 2010-07-01 19:05:34.915184001 +0200 +++ docky-2.0.6/configure 2010-09-01 08:10:54.607532001 +0200 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for docky 2.0.5. +# Generated by GNU Autoconf 2.67 for docky 2.0.6. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 @@ -316,7 +316,7 @@ 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" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# 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. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + 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: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -590,7 +590,7 @@ exec 6>&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` @@ -609,8 +609,8 @@ # Identity of this package. PACKAGE_NAME='docky' PACKAGE_TARNAME='docky' -PACKAGE_VERSION='2.0.5' -PACKAGE_STRING='docky 2.0.5' +PACKAGE_VERSION='2.0.6' +PACKAGE_STRING='docky 2.0.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -990,8 +990,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. @@ -1036,7 +1037,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_fn_error "invalid feature name: $ac_useropt" + 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 @@ -1062,7 +1063,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_fn_error "invalid feature name: $ac_useropt" + 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 @@ -1266,7 +1267,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_fn_error "invalid package name: $ac_useropt" + 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 @@ -1282,7 +1283,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_fn_error "invalid package name: $ac_useropt" + 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 @@ -1312,8 +1313,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1321,7 +1322,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1339,13 +1340,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1368,7 +1369,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + 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' @@ -1382,8 +1383,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 @@ -1398,9 +1399,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1439,11 +1440,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + 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_fn_error "$ac_msg" + 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 @@ -1469,7 +1470,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 docky 2.0.5 to adapt to many kinds of systems. +\`configure' configures docky 2.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1483,7 +1484,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 @@ -1535,7 +1536,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of docky 2.0.5:";; + short | recursive ) echo "Configuration of docky 2.0.6:";; esac cat <<\_ACEOF @@ -1722,10 +1723,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -docky configure 2.0.5 -generated by GNU Autoconf 2.65 +docky configure 2.0.6 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 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 @@ -1828,7 +1829,7 @@ 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1908,7 +1909,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1974,10 +1975,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2013,7 +2014,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +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; } @@ -2040,7 +2041,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2062,7 +2063,7 @@ 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2087,8 +2088,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by docky $as_me 2.0.5, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by docky $as_me 2.0.6, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2198,11 +2199,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2236,11 +2235,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2253,11 +2250,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 @@ -2271,11 +2266,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2330,7 +2323,12 @@ 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 @@ -2345,7 +2343,11 @@ { $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 @@ -2421,7 +2423,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $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_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2438,16 +2440,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + 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, @@ -2563,11 +2571,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + 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;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2589,7 +2597,7 @@ # 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_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2599,7 +2607,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2837,7 +2845,7 @@ $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 @@ -2845,7 +2853,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;; @@ -2879,7 +2887,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2895,7 +2903,7 @@ # Define the identity of the package. PACKAGE='docky' - VERSION='2.0.5' + VERSION='2.0.6' cat >>confdefs.h <<_ACEOF @@ -3395,8 +3403,8 @@ 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_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +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:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3510,9 +3518,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +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; } @@ -3554,8 +3561,8 @@ 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 compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3612,9 +3619,9 @@ 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. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3665,8 +3672,8 @@ { { $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 compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +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 @@ -4018,7 +4025,7 @@ case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -4035,7 +4042,7 @@ { $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_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -4159,7 +4166,7 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + 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 $< $@' @@ -4441,13 +4448,13 @@ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + 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_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + 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. @@ -4491,13 +4498,13 @@ if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $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_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + 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:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -4510,7 +4517,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -4600,7 +4607,7 @@ # 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. @@ -4616,11 +4623,11 @@ 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 +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4659,7 +4666,7 @@ # 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. @@ -4675,18 +4682,18 @@ 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 +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : 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 "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4747,7 +4754,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + 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 @@ -4813,7 +4820,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + 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 @@ -4945,8 +4952,7 @@ 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 " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +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 @@ -5741,7 +5747,7 @@ if test "x$PKG_CONFIG" = "xno"; then - as_fn_error "You need to install pkg-config" "$LINENO" 5 + as_fn_error $? "You need to install pkg-config" "$LINENO" 5 fi @@ -6045,8 +6051,8 @@ 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_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +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:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -6572,7 +6578,7 @@ if test "x$MONO" = "xno"; then - as_fn_error "You need to install 'mono'" "$LINENO" 5 + as_fn_error $? "You need to install 'mono'" "$LINENO" 5 fi @@ -6624,7 +6630,7 @@ if test "x$MCS" = "xno"; then - as_fn_error "You need to install 'gmcs'" "$LINENO" 5 + as_fn_error $? "You need to install 'gmcs'" "$LINENO" 5 fi @@ -6707,7 +6713,7 @@ if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else @@ -6902,7 +6908,7 @@ if test "${enable_schemas_install+set}" = set; then : enableval=$enable_schemas_install; case ${enableval} in yes|no) ;; - *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; esac fi @@ -6958,7 +6964,7 @@ if test ! -x "$GAPI2FIXUP"; then - as_fn_error "No gapi post-processor found" "$LINENO" 5 + as_fn_error $? "No gapi post-processor found" "$LINENO" 5 fi # Extract the first word of "gapi2-parser", so it can be a program name with args. @@ -7003,7 +7009,7 @@ if test ! -x "$GAPI2PARSER"; then - as_fn_error "No gapi parser found" "$LINENO" 5 + as_fn_error $? "No gapi parser found" "$LINENO" 5 fi # Extract the first word of "gapi2-codegen", so it can be a program name with args. @@ -7048,7 +7054,7 @@ if test ! -x "$GAPI2CODEGEN"; then - as_fn_error "No gapi code generator found" "$LINENO" 5 + as_fn_error $? "No gapi code generator found" "$LINENO" 5 fi @@ -7273,7 +7279,7 @@ # Put the nasty error message in config.log where it belongs echo "$GCONF_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gconf-sharp-2.0) were not met: + as_fn_error $? "Package requirements (gconf-sharp-2.0) were not met: $GCONF_SHARP_20_PKG_ERRORS @@ -7288,7 +7294,7 @@ $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_fn_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. @@ -7297,7 +7303,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GCONF_SHARP_20_CFLAGS=$pkg_cv_GCONF_SHARP_20_CFLAGS GCONF_SHARP_20_LIBS=$pkg_cv_GCONF_SHARP_20_LIBS @@ -7362,7 +7368,7 @@ # Put the nasty error message in config.log where it belongs echo "$GLADE_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (glade-sharp-2.0) were not met: + as_fn_error $? "Package requirements (glade-sharp-2.0) were not met: $GLADE_SHARP_20_PKG_ERRORS @@ -7377,7 +7383,7 @@ $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_fn_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. @@ -7386,7 +7392,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GLADE_SHARP_20_CFLAGS=$pkg_cv_GLADE_SHARP_20_CFLAGS GLADE_SHARP_20_LIBS=$pkg_cv_GLADE_SHARP_20_LIBS @@ -7451,7 +7457,7 @@ # Put the nasty error message in config.log where it belongs echo "$GLIB_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (glib-sharp-2.0) were not met: + as_fn_error $? "Package requirements (glib-sharp-2.0) were not met: $GLIB_SHARP_20_PKG_ERRORS @@ -7466,7 +7472,7 @@ $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_fn_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. @@ -7475,7 +7481,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GLIB_SHARP_20_CFLAGS=$pkg_cv_GLIB_SHARP_20_CFLAGS GLIB_SHARP_20_LIBS=$pkg_cv_GLIB_SHARP_20_LIBS @@ -7540,7 +7546,7 @@ # Put the nasty error message in config.log where it belongs echo "$GNOME_DESKTOP_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gnome-desktop-sharp-2.0) were not met: + as_fn_error $? "Package requirements (gnome-desktop-sharp-2.0) were not met: $GNOME_DESKTOP_SHARP_20_PKG_ERRORS @@ -7555,7 +7561,7 @@ $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_fn_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. @@ -7564,7 +7570,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GNOME_DESKTOP_SHARP_20_CFLAGS=$pkg_cv_GNOME_DESKTOP_SHARP_20_CFLAGS GNOME_DESKTOP_SHARP_20_LIBS=$pkg_cv_GNOME_DESKTOP_SHARP_20_LIBS @@ -7629,7 +7635,7 @@ # Put the nasty error message in config.log where it belongs echo "$GNOME_KEYRING_SHARP_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gnome-keyring-sharp-1.0) were not met: + as_fn_error $? "Package requirements (gnome-keyring-sharp-1.0) were not met: $GNOME_KEYRING_SHARP_PKG_ERRORS @@ -7644,7 +7650,7 @@ $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_fn_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. @@ -7653,7 +7659,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GNOME_KEYRING_SHARP_CFLAGS=$pkg_cv_GNOME_KEYRING_SHARP_CFLAGS GNOME_KEYRING_SHARP_LIBS=$pkg_cv_GNOME_KEYRING_SHARP_LIBS @@ -7718,7 +7724,7 @@ # Put the nasty error message in config.log where it belongs echo "$GNOME_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gnome-sharp-2.0) were not met: + as_fn_error $? "Package requirements (gnome-sharp-2.0) were not met: $GNOME_SHARP_20_PKG_ERRORS @@ -7733,7 +7739,7 @@ $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_fn_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. @@ -7742,7 +7748,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GNOME_SHARP_20_CFLAGS=$pkg_cv_GNOME_SHARP_20_CFLAGS GNOME_SHARP_20_LIBS=$pkg_cv_GNOME_SHARP_20_LIBS @@ -7807,7 +7813,7 @@ # Put the nasty error message in config.log where it belongs echo "$GNOME_VFS_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gnome-vfs-sharp-2.0) were not met: + as_fn_error $? "Package requirements (gnome-vfs-sharp-2.0) were not met: $GNOME_VFS_SHARP_20_PKG_ERRORS @@ -7822,7 +7828,7 @@ $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_fn_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. @@ -7831,7 +7837,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GNOME_VFS_SHARP_20_CFLAGS=$pkg_cv_GNOME_VFS_SHARP_20_CFLAGS GNOME_VFS_SHARP_20_LIBS=$pkg_cv_GNOME_VFS_SHARP_20_LIBS @@ -7896,7 +7902,7 @@ # Put the nasty error message in config.log where it belongs echo "$GTK_SHARP_20_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gtk-sharp-2.0) were not met: + as_fn_error $? "Package requirements (gtk-sharp-2.0) were not met: $GTK_SHARP_20_PKG_ERRORS @@ -7911,7 +7917,7 @@ $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_fn_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. @@ -7920,7 +7926,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTK_SHARP_20_CFLAGS=$pkg_cv_GTK_SHARP_20_CFLAGS GTK_SHARP_20_LIBS=$pkg_cv_GTK_SHARP_20_LIBS @@ -7985,7 +7991,7 @@ # Put the nasty error message in config.log where it belongs echo "$LIBRSVG_SHARP_PKG_ERRORS" >&5 - as_fn_error "Package requirements (rsvg2-sharp-2.0) were not met: + as_fn_error $? "Package requirements (rsvg2-sharp-2.0) were not met: $LIBRSVG_SHARP_PKG_ERRORS @@ -8000,7 +8006,7 @@ $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_fn_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. @@ -8009,7 +8015,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else LIBRSVG_SHARP_CFLAGS=$pkg_cv_LIBRSVG_SHARP_CFLAGS LIBRSVG_SHARP_LIBS=$pkg_cv_LIBRSVG_SHARP_LIBS @@ -8074,7 +8080,7 @@ # Put the nasty error message in config.log where it belongs echo "$MONO_ADDINS_PKG_ERRORS" >&5 - as_fn_error "Package requirements (mono-addins) were not met: + as_fn_error $? "Package requirements (mono-addins) were not met: $MONO_ADDINS_PKG_ERRORS @@ -8089,7 +8095,7 @@ $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_fn_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. @@ -8098,7 +8104,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else MONO_ADDINS_CFLAGS=$pkg_cv_MONO_ADDINS_CFLAGS MONO_ADDINS_LIBS=$pkg_cv_MONO_ADDINS_LIBS @@ -8163,7 +8169,7 @@ # Put the nasty error message in config.log where it belongs echo "$MONO_ADDINS_GUI_PKG_ERRORS" >&5 - as_fn_error "Package requirements (mono-addins-gui) were not met: + as_fn_error $? "Package requirements (mono-addins-gui) were not met: $MONO_ADDINS_GUI_PKG_ERRORS @@ -8178,7 +8184,7 @@ $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_fn_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. @@ -8187,7 +8193,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else MONO_ADDINS_GUI_CFLAGS=$pkg_cv_MONO_ADDINS_GUI_CFLAGS MONO_ADDINS_GUI_LIBS=$pkg_cv_MONO_ADDINS_GUI_LIBS @@ -8252,7 +8258,7 @@ # Put the nasty error message in config.log where it belongs echo "$MONO_ADDINS_SETUP_PKG_ERRORS" >&5 - as_fn_error "Package requirements (mono-addins-setup) were not met: + as_fn_error $? "Package requirements (mono-addins-setup) were not met: $MONO_ADDINS_SETUP_PKG_ERRORS @@ -8267,7 +8273,7 @@ $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_fn_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. @@ -8276,7 +8282,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else MONO_ADDINS_SETUP_CFLAGS=$pkg_cv_MONO_ADDINS_SETUP_CFLAGS MONO_ADDINS_SETUP_LIBS=$pkg_cv_MONO_ADDINS_SETUP_LIBS @@ -8341,7 +8347,7 @@ # Put the nasty error message in config.log where it belongs echo "$MONO_CAIRO_PKG_ERRORS" >&5 - as_fn_error "Package requirements (mono-cairo) were not met: + as_fn_error $? "Package requirements (mono-cairo) were not met: $MONO_CAIRO_PKG_ERRORS @@ -8356,7 +8362,7 @@ $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_fn_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. @@ -8365,7 +8371,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else MONO_CAIRO_CFLAGS=$pkg_cv_MONO_CAIRO_CFLAGS MONO_CAIRO_LIBS=$pkg_cv_MONO_CAIRO_LIBS @@ -8430,7 +8436,7 @@ # Put the nasty error message in config.log where it belongs echo "$MONO_OPTIONS_PKG_ERRORS" >&5 - as_fn_error "Package requirements (mono-options) were not met: + as_fn_error $? "Package requirements (mono-options) were not met: $MONO_OPTIONS_PKG_ERRORS @@ -8445,7 +8451,7 @@ $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_fn_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. @@ -8454,7 +8460,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else MONO_OPTIONS_CFLAGS=$pkg_cv_MONO_OPTIONS_CFLAGS MONO_OPTIONS_LIBS=$pkg_cv_MONO_OPTIONS_LIBS @@ -8519,7 +8525,7 @@ # Put the nasty error message in config.log where it belongs echo "$NDESK_DBUS_10_PKG_ERRORS" >&5 - as_fn_error "Package requirements (ndesk-dbus-1.0) were not met: + as_fn_error $? "Package requirements (ndesk-dbus-1.0) were not met: $NDESK_DBUS_10_PKG_ERRORS @@ -8534,7 +8540,7 @@ $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_fn_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. @@ -8543,7 +8549,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else NDESK_DBUS_10_CFLAGS=$pkg_cv_NDESK_DBUS_10_CFLAGS NDESK_DBUS_10_LIBS=$pkg_cv_NDESK_DBUS_10_LIBS @@ -8608,7 +8614,7 @@ # Put the nasty error message in config.log where it belongs echo "$NDESK_DBUS_GLIB_10_PKG_ERRORS" >&5 - as_fn_error "Package requirements (ndesk-dbus-glib-1.0) were not met: + as_fn_error $? "Package requirements (ndesk-dbus-glib-1.0) were not met: $NDESK_DBUS_GLIB_10_PKG_ERRORS @@ -8623,7 +8629,7 @@ $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_fn_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. @@ -8632,7 +8638,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else NDESK_DBUS_GLIB_10_CFLAGS=$pkg_cv_NDESK_DBUS_GLIB_10_CFLAGS NDESK_DBUS_GLIB_10_LIBS=$pkg_cv_NDESK_DBUS_GLIB_10_LIBS @@ -8697,7 +8703,7 @@ # Put the nasty error message in config.log where it belongs echo "$NOTIFY_SHARP_PKG_ERRORS" >&5 - as_fn_error "Package requirements (notify-sharp) were not met: + as_fn_error $? "Package requirements (notify-sharp) were not met: $NOTIFY_SHARP_PKG_ERRORS @@ -8712,7 +8718,7 @@ $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_fn_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. @@ -8721,7 +8727,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else NOTIFY_SHARP_CFLAGS=$pkg_cv_NOTIFY_SHARP_CFLAGS NOTIFY_SHARP_LIBS=$pkg_cv_NOTIFY_SHARP_LIBS @@ -8786,7 +8792,7 @@ # Put the nasty error message in config.log where it belongs echo "$WNCK_SHARP_10_PKG_ERRORS" >&5 - as_fn_error "Package requirements (wnck-sharp-1.0) were not met: + as_fn_error $? "Package requirements (wnck-sharp-1.0) were not met: $WNCK_SHARP_10_PKG_ERRORS @@ -8801,7 +8807,7 @@ $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_fn_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. @@ -8810,7 +8816,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else WNCK_SHARP_10_CFLAGS=$pkg_cv_WNCK_SHARP_10_CFLAGS WNCK_SHARP_10_LIBS=$pkg_cv_WNCK_SHARP_10_LIBS @@ -8878,7 +8884,7 @@ # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met: + as_fn_error $? "Package requirements (gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met: $GIO_PKG_ERRORS @@ -8893,7 +8899,7 @@ $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_fn_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. @@ -8902,7 +8908,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GIO_CFLAGS=$pkg_cv_GIO_CFLAGS GIO_LIBS=$pkg_cv_GIO_LIBS @@ -8967,7 +8973,7 @@ # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met: + as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION) were not met: $GTK_PKG_ERRORS @@ -8982,7 +8988,7 @@ $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_fn_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. @@ -8991,7 +8997,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS @@ -9056,7 +9062,7 @@ # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gobject-2.0 >= $GLIB_REQUIRED_VERSION) were not met: + as_fn_error $? "Package requirements (gobject-2.0 >= $GLIB_REQUIRED_VERSION) were not met: $GLIB_PKG_ERRORS @@ -9071,7 +9077,7 @@ $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_fn_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. @@ -9080,7 +9086,7 @@ See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -9378,6 +9384,7 @@ 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$//' @@ -9401,11 +9408,11 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + 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_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -9413,27 +9420,27 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_NUNIT_TRUE}" && test -z "${HAVE_NUNIT_FALSE}"; then - as_fn_error "conditional \"HAVE_NUNIT\" was never defined. + as_fn_error $? "conditional \"HAVE_NUNIT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then - as_fn_error "conditional \"ENABLE_DEBUG\" was never defined. + as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_RELEASE_TRUE}" && test -z "${ENABLE_RELEASE_FALSE}"; then - as_fn_error "conditional \"ENABLE_RELEASE\" was never defined. + as_fn_error $? "conditional \"ENABLE_RELEASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then - as_fn_error "conditional \"ENABLE_DEBUG\" was never defined. + as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -9583,19 +9590,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# 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. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + 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: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -9791,7 +9798,7 @@ 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" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -9844,8 +9851,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by docky $as_me 2.0.5, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by docky $as_me 2.0.6, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9901,11 +9908,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -docky config.status 2.0.5 -configured by $0, generated by GNU Autoconf 2.65, +docky config.status 2.0.6 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 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." @@ -9923,11 +9930,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 @@ -9949,6 +9961,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -9959,7 +9972,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -10089,7 +10102,7 @@ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -10126,7 +10139,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || 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. @@ -10143,7 +10156,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -10157,18 +10170,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + 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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10257,20 +10270,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || 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 @@ -10288,7 +10309,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10316,7 +10337,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + 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 as_fn_append ac_file_inputs " '$ac_f'" @@ -10343,7 +10364,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -10480,22 +10501,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || 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:${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 +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_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -10606,7 +10627,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + 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" @@ -10634,7 +10655,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -10655,7 +10676,7 @@ 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 || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru docky-2.0.5/configure.ac docky-2.0.6/configure.ac --- docky-2.0.5/configure.ac 2010-07-01 19:03:00.505184003 +0200 +++ docky-2.0.6/configure.ac 2010-08-01 10:14:50.780420000 +0200 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) -AC_INIT([docky], [2.0.5]) +AC_INIT([docky], [2.0.6]) AM_INIT_AUTOMAKE([foreign tar-pax]) AC_CONFIG_MACRO_DIR([m4]) diff -Nru docky-2.0.5/debian/changelog docky-2.0.6/debian/changelog --- docky-2.0.5/debian/changelog 2010-09-01 11:18:10.000000000 +0200 +++ docky-2.0.6/debian/changelog 2010-09-01 11:18:11.000000000 +0200 @@ -1,3 +1,31 @@ +docky (2.0.6-1) UNRELEASED; urgency=low + + * New upstream release 2.0.6 "Just lovin' it", + changes include: + + fix check for existing instance + + hitting ESC should cancel drags (LP: #460071) + + make sure plugins enabled by default are added to the dock on first run + and enable Trash docklet by default + + update badge drawing so the text is consistently sized + + fix leak of ThemedIcon/FileIcon in IconFromGIcon + + fix non-square items arent properly darken (LP: #584094) + + remove MenuList.Dispose which is not really needed, solves (LP: #609170) + + shrink config dialog (LP: #591448) + + + RecentDocs: fix crash (LP: #580723) + + Mounter: use a better MountItem.UniqueID and don't fill up gconf with + useless keys (temporary fix for LP: #600311) + + Weather: add weather icon for Smoke (LP: #612437) + + CPUMonitor: fix CPU utilization percentage (LP: #604677) + + GMail: + - add debuging messages to gmail and log web response status when we + have a web exception + - fix crash and leak in Gmail + * debian/patches: + + drop 01_use_cli_for_wrapper.patch + + -- Rico Tzschichholz <ricotz@t-online.de> Wed, 01 Sep 2010 09:37:14 +0200 + docky (2.0.5-1) unstable; urgency=low * New upstream release 2.0.5 "Be proud of your dock", diff -Nru docky-2.0.5/debian/control docky-2.0.6/debian/control --- docky-2.0.5/debian/control 2010-09-01 11:18:10.000000000 +0200 +++ docky-2.0.6/debian/control 2010-09-01 11:18:11.000000000 +0200 @@ -29,7 +29,7 @@ libglib2.0-dev, libgconf2-dev, libgio2.0-cil-dev, -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/docky.git Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/docky.git diff -Nru docky-2.0.5/debian/patches/01_use_cli_for_wrapper.patch docky-2.0.6/debian/patches/01_use_cli_for_wrapper.patch --- docky-2.0.5/debian/patches/01_use_cli_for_wrapper.patch 2010-09-01 11:18:10.000000000 +0200 +++ docky-2.0.6/debian/patches/01_use_cli_for_wrapper.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -Index: docky.debian.git/Docky/docky.in -=================================================================== ---- docky.debian.git.orig/Docky/docky.in -+++ docky.debian.git/Docky/docky.in -@@ -12,7 +12,7 @@ - fi - - if [ `pgrep -u $(id -u) -f Docky.exe | wc -l` -lt 1 ]; then -- exec mono "$DOCKY_EXE" "$@" -+ exec /usr/bin/cli "$DOCKY_EXE" "$@" - else - echo "Docky appears to already be running. Exiting..." - fi diff -Nru docky-2.0.5/debian/patches/series docky-2.0.6/debian/patches/series --- docky-2.0.5/debian/patches/series 2010-09-01 11:18:10.000000000 +0200 +++ docky-2.0.6/debian/patches/series 2010-09-01 11:18:11.000000000 +0200 @@ -1,2 +1 @@ -01_use_cli_for_wrapper.patch use-system-gio-sharp.patch diff -Nru docky-2.0.5/Docky/AssemblyInfo.cs docky-2.0.6/Docky/AssemblyInfo.cs --- docky-2.0.5/Docky/AssemblyInfo.cs 2010-07-01 19:05:38.505184002 +0200 +++ docky-2.0.6/Docky/AssemblyInfo.cs 2010-09-01 08:11:00.547532000 +0200 @@ -46,7 +46,7 @@ // // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("1336")] +[assembly: AssemblyVersion("1354")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. @@ -58,8 +58,8 @@ { internal static class AssemblyInfo { - public const string DisplayVersion = "2.0.5"; - public const string VersionDetails = "bzr docky-2.0 r1336"; + public const string DisplayVersion = "2.0.6"; + public const string VersionDetails = "bzr docky-2.0 r1354"; public const string LocaleDirectory = "/usr/share/locale"; public const string InstallData = "/usr/share"; } diff -Nru docky-2.0.5/Docky/Docky/DockController.cs docky-2.0.6/Docky/Docky/DockController.cs --- docky-2.0.5/Docky/Docky/DockController.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/Docky/DockController.cs 2010-08-24 19:51:18.946278992 +0200 @@ -287,6 +287,7 @@ { foreach (AbstractDockItemProvider provider in PluginManager.ItemProviders) { if (!docks.Any (d => d.Preferences.ItemProviders.Contains (provider))) { + Log<DockController>.Warn ("\"{0}\" seems to have been abaondoned... disabling.", provider.Name); PluginManager.Disable (provider); } } diff -Nru docky-2.0.5/Docky/Docky/Docky.cs docky-2.0.6/Docky/Docky/Docky.cs --- docky-2.0.5/Docky/Docky/Docky.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/Docky/Docky.cs 2010-08-24 20:41:52.206278994 +0200 @@ -24,6 +24,7 @@ using System.IO; using Mono.Unix; +using NDesk.DBus; using Gdk; using Gtk; @@ -71,6 +72,10 @@ // set process name DockServices.System.SetProcessName ("docky"); + if (CheckForInstance ()) { + Log.Error ("Another Docky instance was detected - exiting."); + return; + } // cache main thread SystemService.MainThread = Thread.CurrentThread; @@ -95,6 +100,11 @@ Gnome.Vfs.Vfs.Shutdown (); } + static bool CheckForInstance () + { + return Bus.Session.NameHasOwner ("org.gnome.Docky"); + } + static void CheckComposite () { GLib.Timeout.Add (2000, delegate { diff -Nru docky-2.0.5/Docky/Docky/Interface/DockDragTracker.cs docky-2.0.6/Docky/Docky/Interface/DockDragTracker.cs --- docky-2.0.5/Docky/Docky/Interface/DockDragTracker.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/Docky/Interface/DockDragTracker.cs 2010-08-24 20:35:26.886278993 +0200 @@ -48,6 +48,7 @@ bool drag_disabled = false; int marker = 0; uint drag_hover_timer; + IDictionary<AbstractDockItem, int> original_item_pos = new Dictionary<AbstractDockItem, int> (); AbstractDockItem drag_item; @@ -179,6 +180,8 @@ { Owner.CursorTracker.RequestHighResolution (this); InternalDragActive = true; + Keyboard.Grab (Owner.GdkWindow, true, Gtk.Global.CurrentEventTime); + drag_canceled = false; if (proxy_window != null) { EnableDragTo (); @@ -187,16 +190,21 @@ Gdk.Pixbuf pbuf; drag_item = Owner.HoveredItem; + original_item_pos.Clear (); // If we are in Reposition Mode or over a non-draggable item // dont drag it! if (drag_item is INonPersistedItem || RepositionMode) drag_item = null; - if (drag_item != null) + if (drag_item != null) { + foreach (AbstractDockItem adi in ProviderForItem (drag_item).Items) + original_item_pos [adi] = adi.Position; + pbuf = Owner.HoveredItem.IconSurface (new DockySurface (1, 1), Owner.ZoomedIconSize, Owner.IconSize, 0).LoadToPixbuf (); - else + } else { pbuf = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, true, 8, 1, 1); + } Gtk.Drag.SetIconPixbuf (args.Context, pbuf, pbuf.Width / 2, pbuf.Height / 2); pbuf.Dispose (); @@ -337,6 +345,8 @@ ExternalDragActive = false; } + bool drag_canceled; + /// <summary> /// Emitted on the drag source when the drag finishes /// </summary> @@ -345,7 +355,7 @@ if (RepositionMode) Owner.CursorTracker.CursorPositionChanged -= HandleCursorPositionChanged; - if (drag_item != null) { + if (!drag_canceled && drag_item != null) { if (!Owner.DockHovered) { // Remove from dock AbstractDockItemProvider provider = ProviderForItem (drag_item); @@ -379,6 +389,7 @@ InternalDragActive = false; drag_item = null; + Keyboard.Ungrab (Gtk.Global.CurrentEventTime); Owner.AnimatedDraw (); Owner.CursorTracker.CancelHighResolution (this); @@ -397,7 +408,17 @@ /// </summary> void HandleDragFailed (object o, DragFailedArgs args) { - args.RetVal = true; + drag_canceled = args.DragResult == DragResult.UserCancelled; + + if (drag_canceled) { + foreach (KeyValuePair<AbstractDockItem, int> kvp in original_item_pos) + kvp.Key.Position = kvp.Value; + + Owner.UpdateCollectionBuffer (); + Owner.Preferences.SyncPreferences (); + } + + args.RetVal = !drag_canceled; } /// <summary> diff -Nru docky-2.0.5/Docky/Docky/Interface/DockPreferences.cs docky-2.0.6/Docky/Docky/Interface/DockPreferences.cs --- docky-2.0.5/Docky/Docky/Interface/DockPreferences.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/Docky/Interface/DockPreferences.cs 2010-08-24 20:00:47.446278995 +0200 @@ -1,5 +1,5 @@ // -// Copyright (C) 2009 Jason Smith, Robert Dyer, Chris Szikszoy +// Copyright (C) 2009-2010 Jason Smith, Robert Dyer, Chris Szikszoy // // 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 @@ -350,6 +350,9 @@ DefaultProvider.ItemsChanged += HandleDefaultProviderItemsChanged; + if (FirstRun) + FirstRun = false; + ShowAll (); } @@ -449,6 +452,14 @@ if (WindowManager) DefaultProvider.SetWindowManager (); + // on first run, add default plugins to the dock + if (FirstRun) { + Log<DockPreferences>.Info ("Adding default plugins."); + foreach (AbstractDockItemProvider provider in PluginManager.ItemProviders) + item_providers.Add (provider); + SyncPlugins (); + } + autohide_box.Active = (int) Autohide; UpdateAutohideDescription (); fade_on_hide_check.Sensitive = (int) Autohide > 0; @@ -464,7 +475,6 @@ threedee_check.Sensitive = Position == DockPosition.Bottom; multiple_window_indicator_check.Active = IndicateMultipleWindows; - window_manager_check.Active = DefaultProvider.IsWindowManager; DefaultProvider.WindowManagerChanged += delegate { WindowManager = window_manager_check.Active = DefaultProvider.IsWindowManager; @@ -533,8 +543,6 @@ launcher_music, launcher_im, }.Where (s => !String.IsNullOrEmpty (s)); - - FirstRun = false; } foreach (string launcher in Launchers) { diff -Nru docky-2.0.5/Docky/Docky/Interface/DockWindow.cs docky-2.0.6/Docky/Docky/Interface/DockWindow.cs --- docky-2.0.5/Docky/Docky/Interface/DockWindow.cs 2010-06-30 08:08:05.730310992 +0200 +++ docky-2.0.6/Docky/Docky/Interface/DockWindow.cs 2010-08-01 09:52:09.345963001 +0200 @@ -2338,7 +2338,7 @@ // darken the icon if (darken > 0) { Gdk.Rectangle area = DrawRegionForItemValue (item, center); - surface.Context.Rectangle (area.X, area.Y, area.Height, area.Width); + surface.Context.Rectangle (area.X, area.Y, area.Width, area.Height); surface.Context.Color = new Cairo.Color (0, 0, 0, darken); diff -Nru docky-2.0.5/Docky/Docky/PluginManager.cs docky-2.0.6/Docky/Docky/PluginManager.cs --- docky-2.0.5/Docky/Docky/PluginManager.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/Docky/PluginManager.cs 2010-08-24 19:55:12.726278996 +0200 @@ -92,6 +92,8 @@ // Add feedback when addin is loaded or unloaded AddinManager.AddinLoaded += AddinManagerAddinLoaded; AddinManager.AddinUnloaded += AddinManagerAddinUnloaded; + + Log<PluginManager>.Debug ("Plugin manager initialized."); } public static void Shutdown () diff -Nru docky-2.0.5/Docky/docky.in docky-2.0.6/Docky/docky.in --- docky-2.0.5/Docky/docky.in 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/docky.in 2010-08-24 20:45:24.696278997 +0200 @@ -11,8 +11,4 @@ DOCKY_EXE="@expanded_libdir@/@PACKAGE@/Docky.exe" fi -if [ `pgrep -u $(id -u) -f Docky.exe | wc -l` -lt 1 ]; then - exec mono "$DOCKY_EXE" "$@" -else - echo "Docky appears to already be running. Exiting..." -fi +exec mono "$DOCKY_EXE" "$@" diff -Nru docky-2.0.5/Docky/gtk-gui/Docky.ConfigurationWindow.cs docky-2.0.6/Docky/gtk-gui/Docky.ConfigurationWindow.cs --- docky-2.0.5/Docky/gtk-gui/Docky.ConfigurationWindow.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky/gtk-gui/Docky.ConfigurationWindow.cs 2010-07-06 15:13:36.520626999 +0200 @@ -445,8 +445,8 @@ if ((this.Child != null)) { this.Child.ShowAll(); } - this.DefaultWidth = 420; - this.DefaultHeight = 430; + this.DefaultWidth = 380; + this.DefaultHeight = 390; this.label3.MnemonicWidget = this.theme_combo; this.Show(); this.config_notebook.SwitchPage += new Gtk.SwitchPageHandler(this.OnPageSwitch); diff -Nru docky-2.0.5/Docky/gtk-gui/gui.stetic docky-2.0.6/Docky/gtk-gui/gui.stetic --- docky-2.0.5/Docky/gtk-gui/gui.stetic 2010-07-01 18:36:53.750988000 +0200 +++ docky-2.0.6/Docky/gtk-gui/gui.stetic 2010-08-24 20:01:54.346146000 +0200 @@ -336,7 +336,7 @@ </widget> </child> </widget> - <widget class="Gtk.Window" id="Docky.ConfigurationWindow" design-size="420 430"> + <widget class="Gtk.Window" id="Docky.ConfigurationWindow" design-size="380 390"> <property name="MemberName" /> <property name="Title" translatable="yes">Docky Configuration</property> <property name="Icon">stock:gtk-preferences Menu</property> diff -Nru docky-2.0.5/Docky.Items/Docky.Items/AbstractDockItem.cs docky-2.0.6/Docky.Items/Docky.Items/AbstractDockItem.cs --- docky-2.0.5/Docky.Items/Docky.Items/AbstractDockItem.cs 2010-06-30 08:04:11.820310993 +0200 +++ docky-2.0.6/Docky.Items/Docky.Items/AbstractDockItem.cs 2010-08-01 10:34:05.335963002 +0200 @@ -643,6 +643,45 @@ if (string.IsNullOrEmpty (BadgeText)) return; + int padding = 4; + int lineWidth = 2; + double size = (IsSmall ? 0.9 : 0.65) * Math.Min (surface.Width, surface.Height); + double x = surface.Width - size / 2; + double y = size / 2; + + if (!IsSmall) { + // draw outline shadow + surface.Context.LineWidth = lineWidth; + surface.Context.Color = new Cairo.Color (0, 0, 0, 0.5); + surface.Context.Arc (x, y + 1, size / 2 - lineWidth, 0, Math.PI * 2); + surface.Context.Stroke (); + + // draw filled gradient + RadialGradient rg = new RadialGradient (x, lineWidth, 0, x, lineWidth, size); + rg.AddColorStop (0, badgeColors [0]); + rg.AddColorStop (1.0, badgeColors [1]); + + surface.Context.Pattern = rg; + surface.Context.Arc (x, y, size / 2 - lineWidth, 0, Math.PI * 2); + surface.Context.Fill (); + rg.Destroy (); + + // draw outline + surface.Context.Color = new Cairo.Color (1, 1, 1, 1); + surface.Context.Arc (x, y, size / 2 - lineWidth, 0, Math.PI * 2); + surface.Context.Stroke (); + + surface.Context.LineWidth = lineWidth / 2; + surface.Context.Color = badgeColors [1]; + surface.Context.Arc (x, y, size / 2 - 2 * lineWidth, 0, Math.PI * 2); + surface.Context.Stroke (); + + surface.Context.Color = new Cairo.Color (0, 0, 0, 0.2); + } else { + lineWidth = 0; + padding = 2; + } + using (Pango.Layout layout = DockServices.Drawing.ThemedPangoLayout ()) { layout.Width = Pango.Units.FromPixels (surface.Height / 2); @@ -651,62 +690,35 @@ layout.FontDescription.Weight = Pango.Weight.Bold; Pango.Rectangle inkRect, logicalRect; - int tsize = 3; - do { - layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (tsize); - layout.SetText (BadgeText); - layout.GetPixelExtents (out inkRect, out logicalRect); - tsize++; - } while (Math.Max (logicalRect.Width, logicalRect.Height) < surface.Height / (IsSmall ? 1 : 2) - 8); + layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (surface.Height / 2); + layout.SetText (BadgeText); + layout.GetPixelExtents (out inkRect, out logicalRect); + + size -= 2 * padding + 2 * lineWidth; - int size = Math.Max (logicalRect.Width, logicalRect.Height); - int padding = 4; - int lineWidth = 2; - int x = surface.Width - size / 2 - padding - lineWidth; - int y = size / 2 + padding + lineWidth; + double scale = Math.Min (1, Math.Min (size / (double) logicalRect.Width, size / (double) logicalRect.Height)); if (!IsSmall) { - // draw outline shadow - surface.Context.LineWidth = lineWidth; - surface.Context.Color = new Cairo.Color (0, 0, 0, 0.5); - surface.Context.Arc (x, y + 1, size / 2 + padding, 0, Math.PI * 2); - surface.Context.Stroke (); - - // draw filled gradient - RadialGradient rg = new RadialGradient (x, lineWidth, 0, x, lineWidth, size + 2 * padding); - rg.AddColorStop (0, badgeColors [0]); - rg.AddColorStop (1.0, badgeColors [1]); - - surface.Context.Pattern = rg; - surface.Context.Arc (x, y, size / 2 + padding, 0, Math.PI * 2); - surface.Context.Fill (); - rg.Destroy (); - - // draw outline - surface.Context.Color = new Cairo.Color (1, 1, 1, 1); - surface.Context.Arc (x, y, size / 2 + padding, 0, Math.PI * 2); - surface.Context.Stroke (); - - surface.Context.LineWidth = lineWidth / 2; - surface.Context.Color = badgeColors [1]; - surface.Context.Arc (x, y, size / 2 + padding - lineWidth, 0, Math.PI * 2); - surface.Context.Stroke (); - surface.Context.Color = new Cairo.Color (0, 0, 0, 0.2); } else { - x = surface.Width - logicalRect.Width / 2; - y = logicalRect.Height / 2; surface.Context.Color = new Cairo.Color (0, 0, 0, 0.6); + x = surface.Width - scale * logicalRect.Width / 2; + y = scale * logicalRect.Height / 2; } + surface.Context.MoveTo (x - scale * logicalRect.Width / 2, y - scale * logicalRect.Height / 2); + // draw text - surface.Context.MoveTo (x - logicalRect.Width / 2, y - logicalRect.Height / 2); + surface.Context.Save (); + if (scale < 1) + surface.Context.Scale (scale, scale); - Pango.CairoHelper.LayoutPath (surface.Context, layout); surface.Context.LineWidth = 2; + Pango.CairoHelper.LayoutPath (surface.Context, layout); surface.Context.StrokePreserve (); surface.Context.Color = new Cairo.Color (1, 1, 1, 1); surface.Context.Fill (); + surface.Context.Restore (); layout.FontDescription.Dispose (); layout.Context.Dispose (); @@ -901,7 +913,6 @@ AppDomain.CurrentDomain.ProcessExit -= HandleProcessExit; Gtk.IconTheme.Default.Changed -= HandleIconThemeChanged; ResetBuffers (); - RemoteMenuItems.Dispose (); } #endregion diff -Nru docky-2.0.5/Docky.Items/Docky.Menus/MenuList.cs docky-2.0.6/Docky.Items/Docky.Menus/MenuList.cs --- docky-2.0.5/Docky.Items/Docky.Menus/MenuList.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky.Items/Docky.Menus/MenuList.cs 2010-08-01 09:44:12.865962999 +0200 @@ -33,7 +33,7 @@ Footer, } - public class MenuList : IDisposable + public class MenuList { Dictionary<MenuListContainer, List<MenuItem>> list; Dictionary<MenuListContainer, string> titles; @@ -126,17 +126,5 @@ return result; } - - #region IDisposable implementation - public void Dispose () - { - foreach (List<MenuItem> sublist in list.Values) - sublist.Clear (); - list.Clear (); - titles.Clear (); - list = null; - titles = null; - } - #endregion } } diff -Nru docky-2.0.5/Docky.Items/Docky.Menus/RelatedFileMenuItem.cs docky-2.0.6/Docky.Items/Docky.Menus/RelatedFileMenuItem.cs --- docky-2.0.5/Docky.Items/Docky.Menus/RelatedFileMenuItem.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky.Items/Docky.Menus/RelatedFileMenuItem.cs 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -// -// Copyright (C) 2009 Jason Smith -// -// 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, see <http://www.gnu.org/licenses/>. -// - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.IO; -using System.Text; - -namespace Docky.Menus -{ - - - public class RelatedFileMenuItem : MenuItem - { - public string Uri { get; private set; } - - public RelatedFileMenuItem (string uri) - { - Uri = uri; - - if (uri.StartsWith ("http")) { - Icon = "html"; - } else { - Gnome.IconLookupResultFlags results; - Icon = Gnome.Icon.LookupSync (Gtk.IconTheme.Default, null, uri, null, 0, out results); - } - - if (uri.StartsWith ("file://")) { - Text = Path.GetFileName (Gnome.Vfs.Global.GetLocalPathFromUri (uri)); - } else { - Uri u = new Uri (uri); - Text = System.Uri.UnescapeDataString (uri.Substring (u.Scheme.Length + 3)); - } - } - } -} diff -Nru docky-2.0.5/Docky.Items/Makefile.am docky-2.0.6/Docky.Items/Makefile.am --- docky-2.0.5/Docky.Items/Makefile.am 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky.Items/Makefile.am 2010-08-01 10:14:50.780420000 +0200 @@ -13,7 +13,6 @@ Docky.Items/ItemState.cs \ Docky.Menus/MenuItem.cs \ Docky.Menus/MenuList.cs \ - Docky.Menus/RelatedFileMenuItem.cs \ Docky.Menus/SeparatorMenuItem.cs \ Docky.Menus/WindowMenuItem.cs \ Docky.Menus/IconMenuItem.cs \ diff -Nru docky-2.0.5/Docky.Items/Makefile.in docky-2.0.6/Docky.Items/Makefile.in --- docky-2.0.5/Docky.Items/Makefile.in 2010-07-01 19:05:31.415184001 +0200 +++ docky-2.0.6/Docky.Items/Makefile.in 2010-09-01 08:10:51.547532008 +0200 @@ -322,7 +322,6 @@ Docky.Items/ItemState.cs \ Docky.Menus/MenuItem.cs \ Docky.Menus/MenuList.cs \ - Docky.Menus/RelatedFileMenuItem.cs \ Docky.Menus/SeparatorMenuItem.cs \ Docky.Menus/WindowMenuItem.cs \ Docky.Menus/IconMenuItem.cs \ diff -Nru docky-2.0.5/Docky.Services/AssemblyInfo.cs docky-2.0.6/Docky.Services/AssemblyInfo.cs --- docky-2.0.5/Docky.Services/AssemblyInfo.cs 2010-07-01 19:05:38.465184002 +0200 +++ docky-2.0.6/Docky.Services/AssemblyInfo.cs 2010-09-01 08:11:00.487532001 +0200 @@ -50,8 +50,8 @@ { internal static class AssemblyInfo { - public const string DisplayVersion = "2.0.5"; - public const string VersionDetails = "bzr docky-2.0 r1336"; + public const string DisplayVersion = "2.0.6"; + public const string VersionDetails = "bzr docky-2.0 r1354"; public const string LocaleDirectory = "/usr/share/locale"; public const string DataDirectory = "/usr/share"; } diff -Nru docky-2.0.5/Docky.Services/Docky.Services/DrawingService.cs docky-2.0.6/Docky.Services/Docky.Services/DrawingService.cs --- docky-2.0.5/Docky.Services/Docky.Services/DrawingService.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/Docky.Services/Docky.Services/DrawingService.cs 2010-08-01 10:26:22.375963000 +0200 @@ -223,19 +223,21 @@ /// </returns> public string IconFromGIcon (GLib.Icon icon) { + string name = ""; if (icon is ThemedIcon) { ThemedIcon themeIcon = new ThemedIcon (icon.Handle); - - // if the icon exists in the theme, this will return the relevent ion + // if the icon exists in the theme, this will return the relevent icon if (themeIcon.Names.Any ()) - return themeIcon.Names.FirstOrDefault (n => IconTheme.Default.HasIcon (n)); + name = themeIcon.Names.FirstOrDefault (n => IconTheme.Default.HasIcon (n)); + themeIcon.Dispose (); + } else if (icon is FileIcon) { // in some cases, devices provide their own icon. This will use the device icon. FileIcon iconFile = new FileIcon (icon.Handle); - - return iconFile.File.Path; + name = iconFile.File.Path; + iconFile.Dispose (); } - return ""; + return name; } /// <summary> diff -Nru docky-2.0.5/NEWS docky-2.0.6/NEWS --- docky-2.0.5/NEWS 2010-07-01 18:42:43.535184000 +0200 +++ docky-2.0.6/NEWS 2010-09-01 08:06:43.137531990 +0200 @@ -1,6 +1,34 @@ Docky: The finest dock no money can buy! +2.0.6 "Just lovin' it" (2010-09-01) +=============================================================================== + * Bug-fix and Maintenance Release + * update translations + + CORE: + * fix check for existing instance + * hitting ESC should cancel drags (LP: #460071) + * make sure plugins enabled by default are added to the dock on first run and + enable Trash docklet by default + * update badge drawing so the text is consistently sized + * fix leak of ThemedIcon/FileIcon in IconFromGIcon + * fix non-square items arent properly darken (LP: #584094) + * remove MenuList.Dispose which is not really needed, also solves (LP: #609170) + * shrink config dialog (LP: #591448) + + DOCKLETS: + * RecentDocs: fix crash (LP: #580723) + * Mounter: use a better MountItem.UniqueID and don't fill up gconf with + useless keys (temporary fix for LP: #600311) + * Weather: add weather icon for Smoke (LP: #612437) + * CPUMonitor: fix CPU utilization percentage (LP: #604677) + * GMail: + - add debuging messages to gmail and log web response status when we + have a web exception + - fix crash and leak in Gmail + + 2.0.5 "Be proud of your dock" (2010-07-01) =============================================================================== * Bug-fix and Maintenance Release diff -Nru docky-2.0.5/po/ast.po docky-2.0.6/po/ast.po diff -Nru docky-2.0.5/po/bg.po docky-2.0.6/po/bg.po diff -Nru docky-2.0.5/po/bn.po docky-2.0.6/po/bn.po diff -Nru docky-2.0.5/po/ca.po docky-2.0.6/po/ca.po diff -Nru docky-2.0.5/po/da.po docky-2.0.6/po/da.po diff -Nru docky-2.0.5/po/de.po docky-2.0.6/po/de.po diff -Nru docky-2.0.5/po/el.po docky-2.0.6/po/el.po diff -Nru docky-2.0.5/po/en_GB.po docky-2.0.6/po/en_GB.po diff -Nru docky-2.0.5/po/es.po docky-2.0.6/po/es.po diff -Nru docky-2.0.5/po/et.po docky-2.0.6/po/et.po diff -Nru docky-2.0.5/po/eu.po docky-2.0.6/po/eu.po diff -Nru docky-2.0.5/po/fi.po docky-2.0.6/po/fi.po diff -Nru docky-2.0.5/po/fo.po docky-2.0.6/po/fo.po diff -Nru docky-2.0.5/po/fr.po docky-2.0.6/po/fr.po diff -Nru docky-2.0.5/po/gl.po docky-2.0.6/po/gl.po diff -Nru docky-2.0.5/po/he.po docky-2.0.6/po/he.po diff -Nru docky-2.0.5/po/hi.po docky-2.0.6/po/hi.po diff -Nru docky-2.0.5/po/hr.po docky-2.0.6/po/hr.po diff -Nru docky-2.0.5/po/hu.po docky-2.0.6/po/hu.po diff -Nru docky-2.0.5/po/id.po docky-2.0.6/po/id.po diff -Nru docky-2.0.5/po/is.po docky-2.0.6/po/is.po diff -Nru docky-2.0.5/po/it.po docky-2.0.6/po/it.po diff -Nru docky-2.0.5/po/ja.po docky-2.0.6/po/ja.po diff -Nru docky-2.0.5/po/ko.po docky-2.0.6/po/ko.po diff -Nru docky-2.0.5/po/LINGUAS docky-2.0.6/po/LINGUAS --- docky-2.0.5/po/LINGUAS 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/po/LINGUAS 2010-08-26 13:55:33.641031001 +0200 @@ -4,11 +4,15 @@ bg bn ca +da de +el en_GB es +et eu fi +fo fr gl he @@ -20,11 +24,19 @@ it ja ko +lt +nb +nl pl +pt pt_BR ro ru +sk +sl sv tr uk zh_CN +zh_HK +zh_TW diff -Nru docky-2.0.5/po/lt.po docky-2.0.6/po/lt.po diff -Nru docky-2.0.5/po/nb.po docky-2.0.6/po/nb.po diff -Nru docky-2.0.5/po/nl.po docky-2.0.6/po/nl.po diff -Nru docky-2.0.5/po/pl.po docky-2.0.6/po/pl.po diff -Nru docky-2.0.5/po/pt_BR.po docky-2.0.6/po/pt_BR.po diff -Nru docky-2.0.5/po/pt.po docky-2.0.6/po/pt.po diff -Nru docky-2.0.5/po/ro.po docky-2.0.6/po/ro.po diff -Nru docky-2.0.5/po/ru.po docky-2.0.6/po/ru.po diff -Nru docky-2.0.5/po/sk.po docky-2.0.6/po/sk.po diff -Nru docky-2.0.5/po/sl.po docky-2.0.6/po/sl.po diff -Nru docky-2.0.5/po/sv.po docky-2.0.6/po/sv.po diff -Nru docky-2.0.5/po/tr.po docky-2.0.6/po/tr.po diff -Nru docky-2.0.5/po/uk.po docky-2.0.6/po/uk.po diff -Nru docky-2.0.5/po/zh_CN.po docky-2.0.6/po/zh_CN.po diff -Nru docky-2.0.5/po/zh_HK.po docky-2.0.6/po/zh_HK.po diff -Nru docky-2.0.5/po/zh_TW.po docky-2.0.6/po/zh_TW.po diff -Nru docky-2.0.5/StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs docky-2.0.6/StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs --- docky-2.0.5/StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/CPUMonitor/src/CPUMonitorDockItem.cs 2010-08-24 20:52:16.536278996 +0200 @@ -1,5 +1,6 @@ // -// Copyright (C) 2009 GNOME Do +// Copyright (C) 2009 Jason Smith, Robert Dyer +// Copyright (C) 2010 Robert Dyer // // 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 @@ -32,15 +33,13 @@ namespace CPUMonitor { - - public class CPUMonitorDockItem : AbstractDockItem { const int UpdateMS = 1000; const double RadiusPercent = .9; enum ProcFields { - User=0, // normal processes executing in user mode + User = 0, // normal processes executing in user mode Nice, // niced processes executing in user mode System, // processes executing in kernel mode Idle, // twiddling thunbs @@ -59,17 +58,13 @@ double CPUUtilization { get; set; } double MemoryUtilization { get; set; } - public override string UniqueID () - { - return "CPUMonitor"; - } + public override string UniqueID () { return "CPUMonitor"; } public CPUMonitorDockItem () { regex = new Regex ("\\d+"); - DockServices.System.RunOnThread (() => - { + DockServices.System.RunOnThread (() => { while (!disposed) { UpdateUtilization (); System.Threading.Thread.Sleep (UpdateMS); @@ -93,24 +88,25 @@ string cpu_line = reader.ReadLine (); MatchCollection collection = regex.Matches (cpu_line); try { - long usage = Convert.ToInt64 (collection [(int) ProcFields.Idle].Value) + - Convert.ToInt64 (collection [(int) ProcFields.IRQ].Value) + - Convert.ToInt64 (collection [(int) ProcFields.Nice].Value) + - Convert.ToInt64 (collection [(int) ProcFields.SoftIRQ].Value) + - Convert.ToInt64 (collection [(int) ProcFields.System].Value) + - Convert.ToInt64 (collection [(int) ProcFields.User].Value); + long usage = Convert.ToInt64 (collection [(int) ProcFields.User].Value) + + Convert.ToInt64 (collection [(int) ProcFields.Nice].Value) + + Convert.ToInt64 (collection [(int) ProcFields.System].Value) + + Convert.ToInt64 (collection [(int) ProcFields.Idle].Value) + + Convert.ToInt64 (collection [(int) ProcFields.IOWait].Value) + + Convert.ToInt64 (collection [(int) ProcFields.IRQ].Value) + + Convert.ToInt64 (collection [(int) ProcFields.SoftIRQ].Value); + long idle = Convert.ToInt64 (collection [(int) ProcFields.Idle].Value) + + Convert.ToInt64 (collection [(int) ProcFields.IOWait].Value); long usage_diff = usage - last_usage; - long idle = Convert.ToInt64 (collection [(int) ProcFields.Idle].Value) + - Convert.ToInt64 (collection [(int) ProcFields.IOWait].Value); long idle_diff = idle - last_idle; last_idle = idle; last_usage = usage; + // average it for smoothing if (usage_diff > 0) CPUUtilization = Math.Max (0.01, Math.Round (((1 - (idle_diff / (double) usage_diff)) + CPUUtilization) / 2, 2)); - } catch { CPUUtilization = 0.01; } @@ -146,6 +142,7 @@ Cairo.Color base_color = new Cairo.Color (1, .3, .3, .5).SetHue (120 * (1 - CPUUtilization)); double radius = Math.Max (Math.Min (CPUUtilization * 1.3, 1), .001); + // draw underlay cr.Arc (center, center, center * RadiusPercent, 0, Math.PI * 2); cr.Color = new Cairo.Color (0, 0, 0, .5); @@ -179,7 +176,7 @@ cr.Fill (); lg.Destroy (); - //draw outer circles + // draw outer circles cr.LineWidth = 1; cr.Arc (center, center, center * RadiusPercent, 0, Math.PI * 2); cr.Color = new Cairo.Color (1, 1, 1, .75); diff -Nru docky-2.0.5/StandardPlugins/GMail/src/GMailAtom.cs docky-2.0.6/StandardPlugins/GMail/src/GMailAtom.cs --- docky-2.0.5/StandardPlugins/GMail/src/GMailAtom.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/GMail/src/GMailAtom.cs 2010-08-24 20:24:40.556278995 +0200 @@ -153,12 +153,19 @@ if (DockServices.System.UseProxy) request.Proxy = DockServices.System.Proxy; - using (HttpWebResponse response = (HttpWebResponse)request.GetResponse ()) + using (HttpWebResponse response = (HttpWebResponse) request.GetResponse ()) try { } finally { response.Close (); } } catch (WebException e) { - if (e.Message.IndexOf ("401") != -1) return false; + if (e.Message.IndexOf ("401") != -1) + Log<GMailAtom>.Error ("Invalid username: {0}", e.Message); + else + Log<GMailAtom>.Error ("Network error: {0}", e.Message); + HttpWebResponse response = (HttpWebResponse) e.Response; + Log<GMailAtom>.Debug ("Response status: {0} - {1}", response.StatusCode, response.StatusDescription); + + return false; } catch (Exception) { } return true; @@ -219,8 +226,13 @@ UnreadMessage message = new UnreadMessage (); message.Topic = HttpUtility.HtmlDecode (item.SelectSingleNode ("atom:title", nsmgr).InnerText); - message.FromName = HttpUtility.HtmlDecode (item.SelectSingleNode ("atom:author/atom:name", nsmgr).InnerText); - message.FromEmail = item.SelectSingleNode ("atom:author/atom:email", nsmgr).InnerText; + // apparently random mailing lists can have no author information - bug 595530 + XmlNode from = item.SelectSingleNode ("atom:author/atom:name", nsmgr); + if (from != null) + message.FromName = HttpUtility.HtmlDecode (from.InnerText); + from = item.SelectSingleNode ("atom:author/atom:email", nsmgr); + if (from != null) + message.FromEmail = from.InnerText; message.From = message.FromName + " <" + message.FromEmail + ">"; try { message.SendDate = DateTime.Parse (item.SelectSingleNode ("atom:modified", nsmgr).InnerText); @@ -256,15 +268,18 @@ Gtk.Application.Invoke (delegate { OnGMailChecked (); }); } catch (ThreadAbortException) { Log<GMailAtom>.Debug ("Stoping Atom thread"); - } catch (NullReferenceException) { + } catch (NullReferenceException e) { + Log<GMailAtom>.Debug (e.Message); Gtk.Application.Invoke (delegate { OnGMailFailed (Catalog.GetString ("Feed Error")); }); - } catch (XmlException) { + } catch (XmlException e) { + Log<GMailAtom>.Error ("Error parsing XML: {0}", e.Message); Gtk.Application.Invoke (delegate { OnGMailFailed (Catalog.GetString ("Feed Error")); }); } catch (WebException e) { + Log<GMailAtom>.Error ("Network error: {0}", e.Message); if (e.Message.IndexOf ("401") != -1) Gtk.Application.Invoke (delegate { OnGMailFailed (Catalog.GetString ("Invalid Username")); @@ -273,12 +288,14 @@ Gtk.Application.Invoke (delegate { OnGMailFailed (Catalog.GetString ("Network Error")); }); + HttpWebResponse response = (HttpWebResponse) e.Response; + Log<GMailAtom>.Debug ("Response status: {0} - {1}", response.StatusCode, response.StatusDescription); } catch (ObjectDisposedException) { Gtk.Application.Invoke (delegate { OnGMailFailed (Catalog.GetString ("Network Error")); }); } catch (Exception e) { - Log<GMailAtom>.Error (e.ToString ()); + Log<GMailAtom>.Error (e.Message); Gtk.Application.Invoke (delegate { OnGMailFailed (Catalog.GetString ("General Error")); }); diff -Nru docky-2.0.5/StandardPlugins/GMail/src/GMailItemProvider.cs docky-2.0.6/StandardPlugins/GMail/src/GMailItemProvider.cs --- docky-2.0.5/StandardPlugins/GMail/src/GMailItemProvider.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/GMail/src/GMailItemProvider.cs 2010-07-06 15:09:46.040627004 +0200 @@ -38,6 +38,8 @@ public override void Dispose () { + GMailPreferences.LabelsChanged -= HandleLabelsChanged; + items.ForEach (adi => (RemoveItem (adi as GMailDockItem))); } diff -Nru docky-2.0.5/StandardPlugins/GMail/src/GMailLabel.cs docky-2.0.6/StandardPlugins/GMail/src/GMailLabel.cs --- docky-2.0.5/StandardPlugins/GMail/src/GMailLabel.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/GMail/src/GMailLabel.cs 2010-07-06 15:06:47.500627002 +0200 @@ -27,23 +27,27 @@ public class GMailLabel : AbstractTileObject { - + GMailDockItem item; + public GMailLabel (string labelName) { if (labelName == GMailDockItem.DefaultLabel) ShowActionButton = false; Name = labelName; - GMailDockItem item = GMailItemProvider.items.First (adi => (adi as GMailDockItem).Atom.CurrentLabel == labelName) as GMailDockItem; + item = GMailItemProvider.items.First (adi => (adi as GMailDockItem).Atom.CurrentLabel == labelName) as GMailDockItem; Icon = "gmail"; if (item != null) { - item.IconUpdated += delegate { - SetIcon (item); - }; + item.IconUpdated += HandleItemIconUpdated; SetIcon (item); } } + + void HandleItemIconUpdated (object sender, EventArgs e) + { + SetIcon (item); + } void SetIcon (GMailDockItem item) { @@ -57,5 +61,13 @@ labels.Remove (Name); GMailPreferences.Labels = labels.ToArray (); } + + public override void Dispose () + { + if (item != null) + item.IconUpdated -= HandleItemIconUpdated; + + base.Dispose (); + } } } diff -Nru docky-2.0.5/StandardPlugins/Mounter/src/MountItem.cs docky-2.0.6/StandardPlugins/Mounter/src/MountItem.cs --- docky-2.0.5/StandardPlugins/Mounter/src/MountItem.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/Mounter/src/MountItem.cs 2010-08-01 10:30:16.085962998 +0200 @@ -36,7 +36,7 @@ public override string UniqueID () { - return "MountItem#" + Mnt.Handle.ToString (); + return "MountItem#" + (Mnt.Root != null ? Mnt.Root.Path : Mnt.Handle.ToString ()); } #endregion diff -Nru docky-2.0.5/StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs docky-2.0.6/StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs --- docky-2.0.5/StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs 2010-06-30 10:26:14.750310993 +0200 +++ docky-2.0.6/StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs 2010-08-01 10:04:57.405963002 +0200 @@ -114,17 +114,19 @@ void UpdateInfo () { lock (RecentDocs) { - if (RecentDocs.Count() == 0) { + if (RecentDocs.Count() == 0) CurrentFile = null; - return; - } - - if (CurrentFile == null || RecentDocs.IndexOf (CurrentFile) == -1) + else if (CurrentFile != null && RecentDocs.IndexOf (CurrentFile) == -1) CurrentFile = RecentDocs.First (); } - Icon = CurrentFile.Icon; - HoverText = CurrentFile.HoverText; + if (CurrentFile == null) { + Icon = "folder-recent;;document-open-recent"; + HoverText = "Recent Documents"; + } else { + Icon = CurrentFile.Icon; + HoverText = CurrentFile.HoverText; + } QueueRedraw (); } diff -Nru docky-2.0.5/StandardPlugins/Trash/Resources/Trash.addin.xml docky-2.0.6/StandardPlugins/Trash/Resources/Trash.addin.xml --- docky-2.0.5/StandardPlugins/Trash/Resources/Trash.addin.xml 2010-07-01 19:05:38.885184002 +0200 +++ docky-2.0.6/StandardPlugins/Trash/Resources/Trash.addin.xml 2010-09-01 08:11:01.007532004 +0200 @@ -3,7 +3,7 @@ namespace="Docky" version="1.0" isroot="false" - defaultEnabled="false" + defaultEnabled="true" name="Trash" description="Have a look at your trash!" author="Chris Szikszoy, Robert Dyer" diff -Nru docky-2.0.5/StandardPlugins/Trash/Resources/Trash.addin.xml.in docky-2.0.6/StandardPlugins/Trash/Resources/Trash.addin.xml.in --- docky-2.0.5/StandardPlugins/Trash/Resources/Trash.addin.xml.in 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/Trash/Resources/Trash.addin.xml.in 2010-08-24 19:51:15.486278996 +0200 @@ -3,7 +3,7 @@ namespace="Docky" version="1.0" isroot="false" - defaultEnabled="false" + defaultEnabled="true" name="Trash" description="Have a look at your trash!" author="Chris Szikszoy, Robert Dyer" diff -Nru docky-2.0.5/StandardPlugins/Weather/src/Sources/WeatherChannelWeatherSource.cs docky-2.0.6/StandardPlugins/Weather/src/Sources/WeatherChannelWeatherSource.cs --- docky-2.0.5/StandardPlugins/Weather/src/Sources/WeatherChannelWeatherSource.cs 2010-06-26 15:47:36.543229000 +0200 +++ docky-2.0.6/StandardPlugins/Weather/src/Sources/WeatherChannelWeatherSource.cs 2010-08-24 20:08:06.836278994 +0200 @@ -116,6 +116,7 @@ image_map.Add ("scattered t-storms", "weather-storm"); image_map.Add ("showers", "weather-showers"); image_map.Add ("showers / wind", "weather-showers"); + image_map.Add ("smoke", "weather-fog"); image_map.Add ("sunny", "weather-clear"); image_map.Add ("t-showers", "weather-storm"); image_map.Add ("t-storms", "weather-storm");
Attachment:
signature.asc
Description: OpenPGP digital signature