FalseTrue0TrueFalseFal"
+ "se0.5"
+ "FalseTrue<"
+ "/property>111Lock screen when system is going to sleep"
+ "True"
+ "TrueFalseTrue02"
+ "False"
+ "True0True"
+ "False<b>Light Locker</b>True"
+ "FalseTrue<"
+ "/property>03TrueFalseS"
+ "ecurity2FalseTrueTrue0TrueTrue1help-buttonclose-button<"
+ "widgets>"
};
-static const unsigned xfpm_settings_ui_length = 61871u;
+static const unsigned xfpm_settings_ui_length = 65518u;
diff -Nru xfce4-power-manager-1.6.5/data/Makefile.in xfce4-power-manager-1.6.6/data/Makefile.in
--- xfce4-power-manager-1.6.5/data/Makefile.in 2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -386,6 +386,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/debian/changelog xfce4-power-manager-1.6.6/debian/changelog
--- xfce4-power-manager-1.6.5/debian/changelog 2019-08-21 19:53:32.000000000 +0000
+++ xfce4-power-manager-1.6.6/debian/changelog 2020-03-15 09:48:42.000000000 +0000
@@ -1,3 +1,18 @@
+xfce4-power-manager (1.6.6-1) unstable; urgency=medium
+
+ [ Debian Janitor ]
+ * Trim trailing whitespace.
+ * Bump debhelper from old 11 to 12.
+ * Set upstream metadata fields: Name (from ./configure), Repository.
+ * Update standards version to 4.4.1, no changes needed.
+
+ [ Yves-Alexis Perez ]
+ * d/watch: use uscan special strings
+ * New upstream version 1.6.6
+ * d/control: update standards version to 4.5.0
+
+ -- Yves-Alexis Perez Sun, 15 Mar 2020 10:48:42 +0100
+
xfce4-power-manager (1.6.5-2) unstable; urgency=medium
* d/control: xfpm needs libxfce4ui 4.13
@@ -95,7 +110,7 @@
* New upstream release.
- the tray icon is back. closes: #755551
- * debian/NEWS: add a note about the re-introduction of the tray icon.
+ * debian/NEWS: add a note about the re-introduction of the tray icon.
-- Yves-Alexis Perez Sun, 22 Mar 2015 15:29:32 +0100
@@ -176,27 +191,27 @@
* Correct Vcs-* URLs to point to anonscm.debian.org
[ Jackson Doak ]
- * debian/control:
+ * debian/control:
- Bump standards-version to 3.9.5
- Build-depend on dh-autoreconf
- Drop redondant "Section" category
* debian/rules: --with autoreconf
* Created debian/source/options
- * Create manpages for xfce4-power-information
+ * Create manpages for xfce4-power-information
and xfpm-power-backlight-helper
[ Yves-Alexis Perez ]
* New upstream release.
* debian/control:
- add build-dep on libupower-glib-dev.
- - version upower dependency to >= 0.99.
+ - version upower dependency to >= 0.99.
- replace consolekit recommends by libpam-systemd on linux-any since we
- need logind support.
+ need logind support.
- promote xfce4-power-manager-plugins to recommends since the tray icon is
now gone and the panel plugin is the preferred way to interact with the
daemon.
- remove spurious Sections:
- - update VCS links since xfpm got moved from goodies to desktop.
+ - update VCS links since xfpm got moved from goodies to desktop.
* debian/rules:
- remove .la files.
@@ -226,13 +241,13 @@
* Correct Vcs-* URLs to point to anonscm.debian.org
[ Jackson Doak ]
- * debian/control:
+ * debian/control:
- Bump standards-version to 3.9.4
- Build-depend on dh-autoreconf
- Drop redandant "Section" category
* debian/rules: --with autoreconf
* Created debian/source/options
- * Create manpages for xfce4-power-information
+ * Create manpages for xfce4-power-information
and xfpm-power-backlight-helper
[ Yves-Alexis Perez ]
@@ -446,7 +461,7 @@
* New upstream release.
- fix xfpm crashing when closing LID. closes: #552692
- allow setting lower value in battery warnings. closes: #549207
- - fix FTBFS when building twice in a row. closes: #549650
+ - fix FTBFS when building twice in a row. closes: #549650
* debian/xfce4-power-manager.xml: ship a default config to ask user when
pressing the power button. closes: #544858
@@ -457,7 +472,7 @@
* New upstream release.
* debian/control:
- add Recommends on librsvg2-common, all icons are svg.
- - update standards version to 3.8.3.
+ - update standards version to 3.8.3.
-- Yves-Alexis Perez Tue, 29 Sep 2009 11:33:13 +0200
@@ -489,7 +504,7 @@
* New upstream release.
* debian/control:
- drop build-dep on libglade.
- - update standards version to 3.8.2.
+ - update standards version to 3.8.2.
-- Yves-Alexis Perez Tue, 07 Jul 2009 00:29:41 +0200
diff -Nru xfce4-power-manager-1.6.5/debian/control xfce4-power-manager-1.6.6/debian/control
--- xfce4-power-manager-1.6.5/debian/control 2019-08-21 19:53:32.000000000 +0000
+++ xfce4-power-manager-1.6.6/debian/control 2020-03-15 09:48:42.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Xfce Maintainers
Uploaders: Yves-Alexis Perez
-Build-Depends: debhelper-compat (= 11),
+Build-Depends: debhelper-compat (= 12),
dpkg-dev (>= 1.16.1),
intltool,
libglib2.0-dev,
@@ -19,7 +19,7 @@
libxfconf-0-dev (>= 4.10.0),
pkg-config,
xfce4-dev-tools
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/xfce-team/desktop/xfce4-power-manager.git
Vcs-Browser: https://salsa.debian.org/xfce-team/desktop/xfce4-power-manager
Homepage: https://goodies.xfce.org/projects/applications/xfce4-power-manager
diff -Nru xfce4-power-manager-1.6.5/debian/rules xfce4-power-manager-1.6.6/debian/rules
--- xfce4-power-manager-1.6.5/debian/rules 2019-08-21 19:53:32.000000000 +0000
+++ xfce4-power-manager-1.6.6/debian/rules 2020-03-15 09:48:42.000000000 +0000
@@ -17,7 +17,10 @@
override_dh_install:
find debian/tmp/usr/lib -name 'lib*.la' -delete
- dh_install --fail-missing
+ dh_install
%:
dh $@
+
+override_dh_missing:
+ dh_missing --fail-missing
diff -Nru xfce4-power-manager-1.6.5/debian/upstream/metadata xfce4-power-manager-1.6.6/debian/upstream/metadata
--- xfce4-power-manager-1.6.5/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000
+++ xfce4-power-manager-1.6.6/debian/upstream/metadata 2020-03-15 09:48:42.000000000 +0000
@@ -0,0 +1,2 @@
+Name: xfce4-power-manager
+Repository: git://git.xfce.org/xfce/xfce4-power-manager
diff -Nru xfce4-power-manager-1.6.5/debian/watch xfce4-power-manager-1.6.6/debian/watch
--- xfce4-power-manager-1.6.5/debian/watch 2019-08-21 19:53:32.000000000 +0000
+++ xfce4-power-manager-1.6.6/debian/watch 2020-03-15 09:48:42.000000000 +0000
@@ -1,3 +1,3 @@
-version=4
-https://archive.xfce.org/src/xfce/xfce4-power-manager/([\d\.]+)/ \
- xfce4-power-manager-([\d\.]+)\.tar\.(?:gz|bz2)
+version=3
+https://archive.xfce.org/src/xfce/@PACKAGE@/(\d[\d\.]+)/ \
+ @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
diff -Nru xfce4-power-manager-1.6.5/libdbus/Makefile.in xfce4-power-manager-1.6.6/libdbus/Makefile.in
--- xfce4-power-manager-1.6.5/libdbus/Makefile.in 2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/libdbus/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -386,6 +386,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/ltmain.sh xfce4-power-manager-1.6.6/ltmain.sh
--- xfce4-power-manager-1.6.5/ltmain.sh 2019-08-11 22:43:52.000000000 +0000
+++ xfce4-power-manager-1.6.6/ltmain.sh 2020-03-08 21:31:04.000000000 +0000
@@ -1,12 +1,12 @@
#! /bin/sh
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-## by inline-source v2018-07-24.06
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.6.42-b88ce
+# libtool (GNU libtool) 2.4.6
# Provide generalized library-building support services.
# Written by Gordon Matzigkeit , 1996
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -31,8 +31,8 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.6.42-b88ce
-package_revision=2.4.6.42
+VERSION="2.4.6 Debian-2.4.6-10"
+package_revision=2.4.6
## ------ ##
@@ -64,25 +64,34 @@
# libraries, which are installed to $pkgauxdir.
# Set a version string for this script.
-scriptversion=2018-07-24.06; # UTC
+scriptversion=2015-01-20.17; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
-# This is free software. There is NO warranty; not even for
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Copyright (C) 2004-2018 Bootstrap Authors
-#
-# This file is dual licensed under the terms of the MIT license
-# , and GPL version 3 or later
-# . You must apply one of
-# these licenses when using or redistributing this software or any of
-# the files within it. See the URLs above, or the file `LICENSE`
-# included in the Bootstrap distribution for the full license texts.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES 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 .
-# Please report bugs or propose patches to:
-#
+# Please report bugs or propose patches to gary@gnu.org.
## ------ ##
@@ -131,6 +140,9 @@
fi"
done
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
# Make sure IFS has a sensible default
sp=' '
nl='
@@ -147,26 +159,6 @@
fi
-# func_unset VAR
-# --------------
-# Portably unset VAR.
-# In some shells, an 'unset VAR' statement leaves a non-zero return
-# status if VAR is already unset, which might be problematic if the
-# statement is used at the end of a function (thus poisoning its return
-# value) or when 'set -e' is active (causing even a spurious abort of
-# the script in this case).
-func_unset ()
-{
- { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
-}
-
-
-# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
-func_unset CDPATH
-
-# Make sure ${,E,F}GREP behave sanely.
-func_unset GREP_OPTIONS
-
## ------------------------- ##
## Locate command utilities. ##
@@ -267,7 +259,7 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out
}
- func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
rm -f conftest.sed
SED=$func_path_progs_result
}
@@ -303,7 +295,7 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out
}
- func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
GREP=$func_path_progs_result
}
@@ -588,16 +580,16 @@
{
$debug_cmd
- func_quote_arg pretty "$2"
- eval "$1+=\\ \$func_quote_arg_result"
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
}'
else
func_append_quoted ()
{
$debug_cmd
- func_quote_arg pretty "$2"
- eval "$1=\$$1\\ \$func_quote_arg_result"
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
}
fi
@@ -1099,199 +1091,85 @@
}
-# func_quote_portable EVAL ARG
-# ----------------------------
-# Internal function to portably implement func_quote_arg. Note that we still
-# keep attention to performance here so we as much as possible try to avoid
-# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
-func_quote_portable ()
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
{
$debug_cmd
- func_quote_portable_result=$2
-
- # one-time-loop (easy break)
- while true
- do
- if $1; then
- func_quote_portable_result=`$ECHO "$2" | $SED \
- -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
- break
- fi
-
- # Quote for eval.
- case $func_quote_portable_result in
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
*[\\\`\"\$]*)
- case $func_quote_portable_result in
- *[\[\*\?]*)
- func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
- | $SED "$sed_quote_subst"`
- break
- ;;
- esac
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
- func_quote_portable_old_IFS=$IFS
- for _G_char in '\' '`' '"' '$'
- do
- # STATE($1) PREV($2) SEPARATOR($3)
- set start "" ""
- func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
- IFS=$_G_char
- for _G_part in $func_quote_portable_result
- do
- case $1 in
- quote)
- func_append func_quote_portable_result "$3$2"
- set quote "$_G_part" "\\$_G_char"
- ;;
- start)
- set first "" ""
- func_quote_portable_result=
- ;;
- first)
- set quote "$_G_part" ""
- ;;
- esac
- done
- done
- IFS=$func_quote_portable_old_IFS
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
;;
- *) ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
esac
- break
- done
- func_quote_portable_unquoted_result=$func_quote_portable_result
- case $func_quote_portable_result in
- # double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and variable expansion
- # for a subsequent eval.
- # many bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_portable_result=\"$func_quote_portable_result\"
- ;;
- esac
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
}
-# func_quotefast_eval ARG
-# -----------------------
-# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG',
-# but optimized for speed. Result is stored in $func_quotefast_eval.
-if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
- printf -v _GL_test_printf_tilde %q '~'
- if test '\~' = "$_GL_test_printf_tilde"; then
- func_quotefast_eval ()
- {
- printf -v func_quotefast_eval_result %q "$1"
- }
- else
- # Broken older Bash implementations. Make those faster too if possible.
- func_quotefast_eval ()
- {
- case $1 in
- '~'*)
- func_quote_portable false "$1"
- func_quotefast_eval_result=$func_quote_portable_result
- ;;
- *)
- printf -v func_quotefast_eval_result %q "$1"
- ;;
- esac
- }
- fi
-else
- func_quotefast_eval ()
- {
- func_quote_portable false "$1"
- func_quotefast_eval_result=$func_quote_portable_result
- }
-fi
-
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ $debug_cmd
-# func_quote_arg MODEs ARG
-# ------------------------
-# Quote one ARG to be evaled later. MODEs argument may contain zero or more
-# specifiers listed below separated by ',' character. This function returns two
-# values:
-# i) func_quote_arg_result
-# double-quoted (when needed), suitable for a subsequent eval
-# ii) func_quote_arg_unquoted_result
-# has all characters that are still active within double
-# quotes backslashified. Available only if 'unquoted' is specified.
-#
-# Available modes:
-# ----------------
-# 'eval' (default)
-# - escape shell special characters
-# 'expand'
-# - the same as 'eval'; but do not quote variable references
-# 'pretty'
-# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might
-# be used later in func_quote to get output like: 'echo "a b"' instead
-# of 'echo a\ b'. This is slower than default on some shells.
-# 'unquoted'
-# - produce also $func_quote_arg_unquoted_result which does not contain
-# wrapping double-quotes.
-#
-# Examples for 'func_quote_arg pretty,unquoted string':
-#
-# string | *_result | *_unquoted_result
-# ------------+-----------------------+-------------------
-# " | \" | \"
-# a b | "a b" | a b
-# "a b" | "\"a b\"" | \"a b\"
-# * | "*" | *
-# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\"
-#
-# Examples for 'func_quote_arg pretty,unquoted,expand string':
-#
-# string | *_result | *_unquoted_result
-# --------------+---------------------+--------------------
-# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\"
-func_quote_arg ()
-{
- _G_quote_expand=false
- case ,$1, in
- *,expand,*)
- _G_quote_expand=:
- ;;
+ case $1 in
+ *[\\\`\"]*)
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ _G_arg=$1 ;;
esac
- case ,$1, in
- *,pretty,*|*,expand,*|*,unquoted,*)
- func_quote_portable $_G_quote_expand "$2"
- func_quote_arg_result=$func_quote_portable_result
- func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
- ;;
- *)
- # Faster quote-for-eval for some shells.
- func_quotefast_eval "$2"
- func_quote_arg_result=$func_quotefast_eval_result
+ case $_G_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_arg=\"$_G_arg\"
;;
esac
-}
-
-# func_quote MODEs ARGs...
-# ------------------------
-# Quote all ARGs to be evaled later and join them into single command. See
-# func_quote_arg's description for more info.
-func_quote ()
-{
- $debug_cmd
- _G_func_quote_mode=$1 ; shift
- func_quote_result=
- while test 0 -lt $#; do
- func_quote_arg "$_G_func_quote_mode" "$1"
- if test -n "$func_quote_result"; then
- func_append func_quote_result " $func_quote_arg_result"
- else
- func_append func_quote_result "$func_quote_arg_result"
- fi
- shift
- done
+ func_quote_for_expand_result=$_G_arg
}
@@ -1337,8 +1215,8 @@
_G_cmd=$1
_G_fail_exp=${2-':'}
- func_quote_arg pretty,expand "$_G_cmd"
- eval "func_notquiet $func_quote_arg_result"
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
$opt_dry_run || {
eval "$_G_cmd"
@@ -1363,8 +1241,8 @@
_G_fail_exp=${2-':'}
$opt_quiet || {
- func_quote_arg expand,pretty "$_G_cmd"
- eval "func_echo $func_quote_arg_result"
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
}
$opt_dry_run || {
@@ -1491,26 +1369,30 @@
# End:
#! /bin/sh
+# Set a version string for this script.
+scriptversion=2015-10-07.11; # UTC
+
# A portable, pluggable option parser for Bourne shell.
# Written by Gary V. Vaughan, 2010
-# This is free software. There is NO warranty; not even for
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Copyright (C) 2010-2018 Bootstrap Authors
-#
-# This file is dual licensed under the terms of the MIT license
-# , and GPL version 3 or later
-# . You must apply one of
-# these licenses when using or redistributing this software or any of
-# the files within it. See the URLs above, or the file `LICENSE`
-# included in the Bootstrap distribution for the full license texts.
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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.
-# Please report bugs or propose patches to:
-#
+# 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.
-# Set a version string for this script.
-scriptversion=2018-07-24.06; # UTC
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Please report bugs or propose patches to gary@gnu.org.
## ------ ##
@@ -1533,7 +1415,7 @@
#
# In order for the '--version' option to work, you will need to have a
# suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# Copyright'.
+# starting with '# Written by ' and ending with '# warranty; '.
#
# For '-h' and '--help' to work, you will also need a one line
# description of your script's purpose in a comment directly above the
@@ -1545,7 +1427,7 @@
# to display verbose messages only when your user has specified
# '--verbose'.
#
-# After sourcing this file, you can plug in processing for additional
+# After sourcing this file, you can plug processing for additional
# options by amending the variables from the 'Configuration' section
# below, and following the instructions in the 'Option parsing'
# section further down.
@@ -1594,8 +1476,8 @@
## ------------------------- ##
# This section contains functions for adding, removing, and running hooks
-# in the main code. A hook is just a list of function names that can be
-# run in order later on.
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
# func_hookable FUNC_NAME
# -----------------------
@@ -1628,8 +1510,7 @@
# func_remove_hook FUNC_NAME HOOK_FUNC
# ------------------------------------
-# Remove HOOK_FUNC from the list of hook functions to be called by
-# FUNC_NAME.
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
func_remove_hook ()
{
$debug_cmd
@@ -1638,28 +1519,10 @@
}
-# func_propagate_result FUNC_NAME_A FUNC_NAME_B
-# ---------------------------------------------
-# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
-# *_result variable of FUNC_NAME_B.
-func_propagate_result ()
-{
- $debug_cmd
-
- func_propagate_result_result=:
- if eval "test \"\${${1}_result+set}\" = set"
- then
- eval "${2}_result=\$${1}_result"
- else
- func_propagate_result_result=false
- fi
-}
-
-
# func_run_hooks FUNC_NAME [ARG]...
# ---------------------------------
# Run all hook functions registered to FUNC_NAME.
-# It's assumed that the list of hook functions contains nothing more
+# It is assumed that the list of hook functions contains nothing more
# than a whitespace-delimited list of legal shell function names, and
# no effort is wasted trying to catch shell meta-characters or preserve
# whitespace.
@@ -1667,21 +1530,26 @@
{
$debug_cmd
+ _G_rc_run_hooks=false
+
case " $hookable_fns " in
*" $1 "*) ;;
- *) func_fatal_error "'$1' does not support hook functions." ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
esac
eval _G_hook_fns=\$$1_hooks; shift
for _G_hook in $_G_hook_fns; do
- func_unset "${_G_hook}_result"
- eval $_G_hook '${1+"$@"}'
- func_propagate_result $_G_hook func_run_hooks
- if $func_propagate_result_result; then
- eval set dummy "$func_run_hooks_result"; shift
+ if eval $_G_hook '"$@"'; then
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ _G_rc_run_hooks=:
fi
done
+
+ $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
}
@@ -1691,16 +1559,14 @@
## --------------- ##
# In order to add your own option parsing hooks, you must accept the
-# full positional parameter list from your hook function. You may remove
-# or edit any options that you action, and then pass back the remaining
-# unprocessed options in '_result', escaped
-# suitably for 'eval'.
-#
-# The '_result' variable is automatically unset
-# before your hook gets called; for best performance, only set the
-# *_result variable when necessary (i.e. don't call the 'func_quote'
-# function unnecessarily because it can be an expensive operation on some
-# machines).
+# full positional parameter list in your hook function, you may remove/edit
+# any options that you action, and then pass back the remaining unprocessed
+# options in '_result', escaped suitably for
+# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
+# hook's caller know that it should pay attention to
+# '_result'. Returning $EXIT_FAILURE signalizes that
+# arguments are left untouched by the hook and therefore caller will ignore the
+# result variable.
#
# Like this:
#
@@ -1712,8 +1578,11 @@
# usage_message=$usage_message'
# -s, --silent don'\''t print informational messages
# '
-# # No change in '$@' (ignored completely by this hook). Leave
-# # my_options_prep_result variable intact.
+# # No change in '$@' (ignored completely by this hook). There is
+# # no need to do the equivalent (but slower) action:
+# # func_quote_for_eval ${1+"$@"}
+# # my_options_prep_result=$func_quote_for_eval_result
+# false
# }
# func_add_hook func_options_prep my_options_prep
#
@@ -1724,7 +1593,7 @@
#
# args_changed=false
#
-# # Note that, for efficiency, we parse as many options as we can
+# # Note that for efficiency, we parse as many options as we can
# # recognise in a loop before passing the remainder back to the
# # caller on the first unrecognised argument we encounter.
# while test $# -gt 0; do
@@ -1741,17 +1610,18 @@
# args_changed=:
# ;;
# *) # Make sure the first unrecognised option "$_G_opt"
-# # is added back to "$@" in case we need it later,
-# # if $args_changed was set to 'true'.
+# # is added back to "$@", we could need that later
+# # if $args_changed is true.
# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
# esac
# done
#
-# # Only call 'func_quote' here if we processed at least one argument.
# if $args_changed; then
-# func_quote eval ${1+"$@"}
-# my_silent_option_result=$func_quote_result
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
# fi
+#
+# $args_changed
# }
# func_add_hook func_parse_options my_silent_option
#
@@ -1762,6 +1632,8 @@
#
# $opt_silent && $opt_verbose && func_fatal_help "\
# '--silent' and '--verbose' options are mutually exclusive."
+#
+# false
# }
# func_add_hook func_validate_options my_option_validation
#
@@ -1777,8 +1649,13 @@
{
$debug_cmd
- func_run_hooks func_options ${1+"$@"}
- func_propagate_result func_run_hooks func_options_finish
+ _G_func_options_finish_exit=false
+ if func_run_hooks func_options ${1+"$@"}; then
+ func_options_finish_result=$func_run_hooks_result
+ _G_func_options_finish_exit=:
+ fi
+
+ $_G_func_options_finish_exit
}
@@ -1791,27 +1668,28 @@
{
$debug_cmd
- _G_options_quoted=false
+ _G_rc_options=false
for my_func in options_prep parse_options validate_options options_finish
do
- func_unset func_${my_func}_result
- func_unset func_run_hooks_result
- eval func_$my_func '${1+"$@"}'
- func_propagate_result func_$my_func func_options
- if $func_propagate_result_result; then
- eval set dummy "$func_options_result"; shift
- _G_options_quoted=:
+ if eval func_$my_func '${1+"$@"}'; then
+ eval _G_res_var='$'"func_${my_func}_result"
+ eval set dummy "$_G_res_var" ; shift
+ _G_rc_options=:
fi
done
- $_G_options_quoted || {
- # As we (func_options) are top-level options-parser function and
- # nobody quoted "$@" for us yet, we need to do it explicitly for
- # caller.
- func_quote eval ${1+"$@"}
- func_options_result=$func_quote_result
- }
+ # Save modified positional parameters for caller. As a top-level
+ # options-parser function we always need to set the 'func_options_result'
+ # variable (regardless the $_G_rc_options value).
+ if $_G_rc_options; then
+ func_options_result=$_G_res_var
+ else
+ func_quote_for_eval ${1+"$@"}
+ func_options_result=$func_quote_for_eval_result
+ fi
+
+ $_G_rc_options
}
@@ -1821,7 +1699,8 @@
# Note that when calling hook functions, we pass through the list of
# positional parameters. If a hook function modifies that list, and
# needs to propagate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before returning.
+# modified list must be put in 'func_run_hooks_result' before
+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
func_hookable func_options_prep
func_options_prep ()
{
@@ -1831,8 +1710,14 @@
opt_verbose=false
opt_warning_types=
- func_run_hooks func_options_prep ${1+"$@"}
- func_propagate_result func_run_hooks func_options_prep
+ _G_rc_options_prep=false
+ if func_run_hooks func_options_prep ${1+"$@"}; then
+ _G_rc_options_prep=:
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
+ fi
+
+ $_G_rc_options_prep
}
@@ -1844,32 +1729,27 @@
{
$debug_cmd
- _G_parse_options_requote=false
+ func_parse_options_result=
+
+ _G_rc_parse_options=false
# this just eases exit handling
while test $# -gt 0; do
# Defer to hook functions for initial option parsing, so they
# get priority in the event of reusing an option name.
- func_run_hooks func_parse_options ${1+"$@"}
- func_propagate_result func_run_hooks func_parse_options
- if $func_propagate_result_result; then
- eval set dummy "$func_parse_options_result"; shift
- # Even though we may have changed "$@", we passed the "$@" array
- # down into the hook and it quoted it for us (because we are in
- # this if-branch). No need to quote it again.
- _G_parse_options_requote=false
+ if func_run_hooks func_parse_options ${1+"$@"}; then
+ eval set dummy "$func_run_hooks_result"; shift
+ _G_rc_parse_options=:
fi
# Break out of the loop if we already parsed every option.
test $# -gt 0 || break
- # We expect that one of the options parsed in this function matches
- # and thus we remove _G_opt from "$@" and need to re-quote.
_G_match_parse_options=:
_G_opt=$1
shift
case $_G_opt in
--debug|-x) debug_cmd='set -x'
- func_echo "enabling shell trace mode" >&2
+ func_echo "enabling shell trace mode"
$debug_cmd
;;
@@ -1880,7 +1760,7 @@
--warnings|--warning|-W)
if test $# = 0 && func_missing_arg $_G_opt; then
- _G_parse_options_requote=:
+ _G_rc_parse_options=:
break
fi
case " $warning_categories $1" in
@@ -1935,7 +1815,7 @@
shift
;;
- --) _G_parse_options_requote=: ; break ;;
+ --) _G_rc_parse_options=: ; break ;;
-*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
*) set dummy "$_G_opt" ${1+"$@"}; shift
_G_match_parse_options=false
@@ -1943,16 +1823,17 @@
;;
esac
- if $_G_match_parse_options; then
- _G_parse_options_requote=:
- fi
+ $_G_match_parse_options && _G_rc_parse_options=:
done
- if $_G_parse_options_requote; then
+
+ if $_G_rc_parse_options; then
# save modified positional parameters for caller
- func_quote eval ${1+"$@"}
- func_parse_options_result=$func_quote_result
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
fi
+
+ $_G_rc_parse_options
}
@@ -1965,14 +1846,21 @@
{
$debug_cmd
+ _G_rc_validate_options=false
+
# Display all warnings if -W was not given.
test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
- func_run_hooks func_validate_options ${1+"$@"}
- func_propagate_result func_run_hooks func_validate_options
+ if func_run_hooks func_validate_options ${1+"$@"}; then
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
+ _G_rc_validate_options=:
+ fi
# Bail if the options were screwed!
$exit_cmd $EXIT_FAILURE
+
+ $_G_rc_validate_options
}
@@ -2028,8 +1916,8 @@
# func_split_equals STRING
# ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables
-# after splitting STRING at the '=' sign.
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
test -z "$_G_HAVE_XSI_OPS" \
&& (eval 'x=a/b/c;
test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
@@ -2044,9 +1932,8 @@
func_split_equals_lhs=${1%%=*}
func_split_equals_rhs=${1#*=}
- if test "x$func_split_equals_lhs" = "x$1"; then
- func_split_equals_rhs=
- fi
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
}'
else
# ...otherwise fall back to using expr, which is often a shell builtin.
@@ -2124,44 +2011,31 @@
# func_version
# ------------
# Echo version message to standard output and exit.
-# The version message is extracted from the calling file's header
-# comments, with leading '# ' stripped:
-# 1. First display the progname and version
-# 2. Followed by the header comment line matching /^# Written by /
-# 3. Then a blank line followed by the first following line matching
-# /^# Copyright /
-# 4. Immediately followed by any lines between the previous matches,
-# except lines preceding the intervening completely blank line.
-# For example, see the header comments of this file.
func_version ()
{
$debug_cmd
printf '%s\n' "$progname $scriptversion"
$SED -n '
- /^# Written by /!b
- s|^# ||; p; n
-
- :fwd2blnk
- /./ {
- n
- b fwd2blnk
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
}
- p; n
-
- :holdwrnt
- s|^# ||
- s|^# *$||
- /^Copyright /!{
- /./H
- n
- b holdwrnt
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
}
-
- s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
- G
- s|\(\n\)\n*|\1|g
- p; q' < "$progpath"
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
exit $?
}
@@ -2171,12 +2045,12 @@
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
# time-stamp-time-zone: "UTC"
# End:
# Set a version string.
-scriptversion='(GNU libtool) 2.4.6.42-b88ce'
+scriptversion='(GNU libtool) 2.4.6'
# func_echo ARG...
@@ -2267,7 +2141,7 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.6.42-b88ce
+ version: $progname $scriptversion Debian-2.4.6-10
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
@@ -2323,7 +2197,7 @@
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_fatal_error ${1+"$@"} \
+ func__fatal_error ${1+"$@"} \
"See the $PACKAGE documentation for more information." \
"Fatal configuration error."
}
@@ -2501,9 +2375,11 @@
if $_G_rc_lt_options_prep; then
# Pass back the list of options.
- func_quote eval ${1+"$@"}
- libtool_options_prep_result=$func_quote_result
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
fi
+
+ $_G_rc_lt_options_prep
}
func_add_hook func_options_prep libtool_options_prep
@@ -2606,9 +2482,11 @@
if $_G_rc_lt_parse_options; then
# save modified positional parameters for caller
- func_quote eval ${1+"$@"}
- libtool_parse_options_result=$func_quote_result
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
fi
+
+ $_G_rc_lt_parse_options
}
func_add_hook func_parse_options libtool_parse_options
@@ -2665,8 +2543,8 @@
}
# Pass back the unparsed argument list
- func_quote eval ${1+"$@"}
- libtool_validate_options_result=$func_quote_result
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
func_add_hook func_validate_options libtool_validate_options
@@ -3632,8 +3510,8 @@
esac
done
- func_quote_arg pretty "$libobj"
- test "X$libobj" != "X$func_quote_arg_result" \
+ func_quote_for_eval "$libobj"
+ test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
&& func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
@@ -3706,8 +3584,8 @@
func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
srcfile=$func_to_tool_file_result
- func_quote_arg pretty "$srcfile"
- qsrcfile=$func_quote_arg_result
+ func_quote_for_eval "$srcfile"
+ qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
if test yes = "$build_libtool_libs"; then
@@ -4310,8 +4188,8 @@
case $nonopt in *shtool*) :;; *) false;; esac
then
# Aesthetically quote it.
- func_quote_arg pretty "$nonopt"
- install_prog="$func_quote_arg_result "
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
arg=$1
shift
else
@@ -4321,8 +4199,8 @@
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
- func_quote_arg pretty "$arg"
- func_append install_prog "$func_quote_arg_result"
+ func_quote_for_eval "$arg"
+ func_append install_prog "$func_quote_for_eval_result"
install_shared_prog=$install_prog
case " $install_prog " in
*[\\\ /]cp\ *) install_cp=: ;;
@@ -4379,12 +4257,12 @@
esac
# Aesthetically quote the argument.
- func_quote_arg pretty "$arg"
- func_append install_prog " $func_quote_arg_result"
+ func_quote_for_eval "$arg"
+ func_append install_prog " $func_quote_for_eval_result"
if test -n "$arg2"; then
- func_quote_arg pretty "$arg2"
+ func_quote_for_eval "$arg2"
fi
- func_append install_shared_prog " $func_quote_arg_result"
+ func_append install_shared_prog " $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -4395,8 +4273,8 @@
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
- func_quote_arg pretty "$install_override_mode"
- func_append install_shared_prog " -m $func_quote_arg_result"
+ func_quote_for_eval "$install_override_mode"
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
fi
fi
@@ -4692,8 +4570,8 @@
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_quiet || {
- func_quote_arg expand,pretty "$relink_command"
- eval "func_echo $func_quote_arg_result"
+ func_quote_for_expand "$relink_command"
+ eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
@@ -5472,8 +5350,7 @@
if test \"\$libtool_execute_magic\" != \"$magic\"; then
file=\"\$0\""
- func_quote_arg pretty "$ECHO"
- qECHO=$func_quote_arg_result
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
$ECHO "\
# A function that is used when there is no print builtin or printf.
@@ -5483,7 +5360,7 @@
\$1
_LTECHO_EOF'
}
- ECHO=$qECHO
+ ECHO=\"$qECHO\"
fi
# Very basic option parsing. These options are (a) specific to
@@ -6826,9 +6703,9 @@
while test "$#" -gt 0; do
arg=$1
shift
- func_quote_arg pretty,unquoted "$arg"
- qarg=$func_quote_arg_unquoted_result
- func_append libtool_args " $func_quote_arg_result"
+ func_quote_for_eval "$arg"
+ qarg=$func_quote_for_eval_unquoted_result
+ func_append libtool_args " $func_quote_for_eval_result"
# If the previous option needs an argument, assign it.
if test -n "$prev"; then
@@ -7426,9 +7303,9 @@
save_ifs=$IFS; IFS=,
for flag in $args; do
IFS=$save_ifs
- func_quote_arg pretty "$flag"
- func_append arg " $func_quote_arg_result"
- func_append compiler_flags " $func_quote_arg_result"
+ func_quote_for_eval "$flag"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
done
IFS=$save_ifs
func_stripname ' ' '' "$arg"
@@ -7442,10 +7319,10 @@
save_ifs=$IFS; IFS=,
for flag in $args; do
IFS=$save_ifs
- func_quote_arg pretty "$flag"
- func_append arg " $wl$func_quote_arg_result"
- func_append compiler_flags " $wl$func_quote_arg_result"
- func_append linker_flags " $func_quote_arg_result"
+ func_quote_for_eval "$flag"
+ func_append arg " $wl$func_quote_for_eval_result"
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
+ func_append linker_flags " $func_quote_for_eval_result"
done
IFS=$save_ifs
func_stripname ' ' '' "$arg"
@@ -7469,8 +7346,8 @@
# -msg_* for osf cc
-msg_*)
- func_quote_arg pretty "$arg"
- arg=$func_quote_arg_result
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -7495,8 +7372,8 @@
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*|-fsanitize=*|-fuse-ld=*)
- func_quote_arg pretty "$arg"
- arg=$func_quote_arg_result
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
@@ -7517,15 +7394,15 @@
continue
else
# Otherwise treat like 'Some other compiler flag' below
- func_quote_arg pretty "$arg"
- arg=$func_quote_arg_result
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
fi
;;
# Some other compiler flag.
-* | +*)
- func_quote_arg pretty "$arg"
- arg=$func_quote_arg_result
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -7645,8 +7522,8 @@
*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
- func_quote_arg pretty "$arg"
- arg=$func_quote_arg_result
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -7787,7 +7664,10 @@
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -8106,19 +7986,19 @@
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -9042,6 +8922,9 @@
revision=$number_minor
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
+ ;;
esac
;;
no)
@@ -10152,8 +10035,8 @@
for cmd in $concat_cmds; do
IFS=$save_ifs
$opt_quiet || {
- func_quote_arg expand,pretty "$cmd"
- eval "func_echo $func_quote_arg_result"
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
}
$opt_dry_run || eval "$cmd" || {
lt_exit=$?
@@ -10246,8 +10129,8 @@
eval cmd=\"$cmd\"
IFS=$save_ifs
$opt_quiet || {
- func_quote_arg expand,pretty "$cmd"
- eval "func_echo $func_quote_arg_result"
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
}
$opt_dry_run || eval "$cmd" || {
lt_exit=$?
@@ -10721,13 +10604,12 @@
elif eval var_value=\$$var; test -z "$var_value"; then
relink_command="$var=; export $var; $relink_command"
else
- func_quote_arg pretty "$var_value"
- relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
+ func_quote_for_eval "$var_value"
+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
done
- func_quote eval cd "`pwd`"
- func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
- relink_command=$func_quote_arg_unquoted_result
+ relink_command="(cd `pwd`; $relink_command)"
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -10967,15 +10849,13 @@
elif eval var_value=\$$var; test -z "$var_value"; then
relink_command="$var=; export $var; $relink_command"
else
- func_quote_arg pretty,unquoted "$var_value"
- relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
+ func_quote_for_eval "$var_value"
+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
done
# Quote the link command for shipping.
- func_quote eval cd "`pwd`"
- relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- func_quote_arg pretty,unquoted "$relink_command"
- relink_command=$func_quote_arg_unquoted_result
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test yes = "$hardcode_automatic"; then
relink_command=
fi
diff -Nru xfce4-power-manager-1.6.5/Makefile.in xfce4-power-manager-1.6.6/Makefile.in
--- xfce4-power-manager-1.6.5/Makefile.in 2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -408,6 +408,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/NEWS xfce4-power-manager-1.6.6/NEWS
--- xfce4-power-manager-1.6.5/NEWS 2019-08-11 22:43:33.000000000 +0000
+++ xfce4-power-manager-1.6.6/NEWS 2020-03-08 21:30:48.000000000 +0000
@@ -1,3 +1,15 @@
+1.6.6
+======
+- Dismiss critical notification when connecting to AC
+- Fix inhibiting xfce4-screensaver (Bug #16364)
+- settings: Move % sign out of spinbutton (Bug #15994)
+- panel-plugin: Toggle presentation mode on middle click
+- panel-plugin: Properly show 'About' menu item
+- panel-plugin: Add missing about callback
+- panel-plugin: Properly hook up about signal
+- panel-plugin: Replace deprecated call
+- Switch to symbolic window-close icons
+
1.6.5
======
- Improve size of critical power level spin
diff -Nru xfce4-power-manager-1.6.5/panel-plugins/Makefile.in xfce4-power-manager-1.6.6/panel-plugins/Makefile.in
--- xfce4-power-manager-1.6.5/panel-plugins/Makefile.in 2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/panel-plugins/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -386,6 +386,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/Makefile.in xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/Makefile.in
--- xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/Makefile.in 2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -386,6 +386,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/power-manager-button.c xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/power-manager-button.c
--- xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/power-manager-button.c 2019-08-02 03:34:04.000000000 +0000
+++ xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/power-manager-button.c 2020-03-05 23:31:57.000000000 +0000
@@ -1045,9 +1045,23 @@
{
PowerManagerButton *button = POWER_MANAGER_BUTTON (widget);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
- power_manager_button_show_menu (button);
- return TRUE;
+ if (event->button == 1 && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ power_manager_button_show_menu (button);
+ return TRUE;
+ }
+
+ if (event->button == 2)
+ {
+ gboolean state;
+
+ state = xfconf_channel_get_bool (button->priv->channel, XFPM_PROPERTIES_PREFIX PRESENTATION_MODE, FALSE);
+ xfconf_channel_set_bool (button->priv->channel, XFPM_PROPERTIES_PREFIX PRESENTATION_MODE, !state);
+ return TRUE;
+ }
+
+ return FALSE;
}
#ifdef XFCE_PLUGIN
@@ -1113,19 +1127,13 @@
{
gtk_widget_destroy (GTK_WIDGET (button));
}
-#endif
-
-static void
-help_cb (GtkMenuItem *menuitem, gpointer user_data)
-{
- xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
-}
static void
about_cb (GtkMenuItem *menuitem, gpointer user_data)
{
- xfpm_about ("xfce4-power-manager");
+ xfpm_about ("xfce4-power-manager");
}
+#endif
void
power_manager_button_show (PowerManagerButton *button)
@@ -1148,20 +1156,9 @@
gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (hbox));
- /* help dialog */
- mi = gtk_menu_item_new_with_mnemonic (_("_Help"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect (mi, "activate", G_CALLBACK (help_cb), button);
-
- /* about dialog */
- mi = gtk_menu_item_new_with_mnemonic (_("_About"));
- gtk_widget_set_sensitive (mi, TRUE);
- gtk_widget_show (mi);
- g_signal_connect (mi, "activate", G_CALLBACK (about_cb), button);
-
#ifdef XFCE_PLUGIN
- xfce_panel_plugin_menu_insert_item (button->priv->plugin, GTK_MENU_ITEM (mi));
+ xfce_panel_plugin_menu_show_about (button->priv->plugin);
+ g_signal_connect (button->priv->plugin, "about", G_CALLBACK (about_cb), NULL);
g_signal_connect (button->priv->plugin, "size-changed",
G_CALLBACK (power_manager_button_size_changed_cb), button);
diff -Nru xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/xfce/Makefile.in xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/xfce/Makefile.in
--- xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/xfce/Makefile.in 2019-08-11 22:43:56.000000000 +0000
+++ xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/xfce/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -422,6 +422,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
--- xfce4-power-manager-1.6.5/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c 2019-08-02 03:32:48.000000000 +0000
+++ xfce4-power-manager-1.6.6/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c 2020-03-05 23:31:57.000000000 +0000
@@ -159,7 +159,7 @@
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
GTK_DIALOG_DESTROY_WITH_PARENT,
"help-browser", _("_Help"), GTK_RESPONSE_HELP,
- "window-close", _("_Close"), GTK_RESPONSE_OK,
+ "window-close-symbolic", _("_Close"), GTK_RESPONSE_OK,
NULL);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
@@ -227,7 +227,7 @@
XfconfChannel *channel;
/* allocate memory for the plugin structure */
- power_manager_plugin = panel_slice_new0 (PowerManagerPlugin);
+ power_manager_plugin = g_slice_new0 (PowerManagerPlugin);
/* pointer to plugin */
power_manager_plugin->plugin = plugin;
diff -Nru xfce4-power-manager-1.6.5/settings/Makefile.in xfce4-power-manager-1.6.6/settings/Makefile.in
--- xfce4-power-manager-1.6.5/settings/Makefile.in 2019-08-11 22:43:56.000000000 +0000
+++ xfce4-power-manager-1.6.6/settings/Makefile.in 2020-03-08 21:31:09.000000000 +0000
@@ -426,6 +426,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/settings/xfce-power-manager-dbus.c xfce4-power-manager-1.6.6/settings/xfce-power-manager-dbus.c
--- xfce4-power-manager-1.6.5/settings/xfce-power-manager-dbus.c 2018-12-07 01:47:48.000000000 +0000
+++ xfce4-power-manager-1.6.6/settings/xfce-power-manager-dbus.c 2020-03-08 21:31:20.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.58.1 from org.xfce.Power.Manager.xml. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.60.4 from org.xfce.Power.Manager.xml. DO NOT EDIT.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
@@ -39,7 +39,8 @@
{
GDBusPropertyInfo parent_struct;
const gchar *hyphen_name;
- gboolean use_gvariant;
+ guint use_gvariant : 1;
+ guint emits_changed_signal : 1;
} _ExtendedGDBusPropertyInfo;
typedef struct
@@ -659,7 +660,7 @@
/**
* xfpm_power_manager_call_get_config_finish:
* @proxy: A #XfpmPowerManagerProxy.
- * @out_config: (out): Return location for return parameter or %NULL to ignore.
+ * @out_config: (out) (optional): Return location for return parameter or %NULL to ignore.
* @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfpm_power_manager_call_get_config().
* @error: Return location for error or %NULL.
*
@@ -689,7 +690,7 @@
/**
* xfpm_power_manager_call_get_config_sync:
* @proxy: A #XfpmPowerManagerProxy.
- * @out_config: (out): Return location for return parameter or %NULL to ignore.
+ * @out_config: (out) (optional): Return location for return parameter or %NULL to ignore.
* @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
@@ -757,9 +758,9 @@
/**
* xfpm_power_manager_call_get_info_finish:
* @proxy: A #XfpmPowerManagerProxy.
- * @out_name: (out): Return location for return parameter or %NULL to ignore.
- * @out_version: (out): Return location for return parameter or %NULL to ignore.
- * @out_vendor: (out): Return location for return parameter or %NULL to ignore.
+ * @out_name: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @out_version: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @out_vendor: (out) (optional): Return location for return parameter or %NULL to ignore.
* @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to xfpm_power_manager_call_get_info().
* @error: Return location for error or %NULL.
*
@@ -793,9 +794,9 @@
/**
* xfpm_power_manager_call_get_info_sync:
* @proxy: A #XfpmPowerManagerProxy.
- * @out_name: (out): Return location for return parameter or %NULL to ignore.
- * @out_version: (out): Return location for return parameter or %NULL to ignore.
- * @out_vendor: (out): Return location for return parameter or %NULL to ignore.
+ * @out_name: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @out_version: (out) (optional): Return location for return parameter or %NULL to ignore.
+ * @out_vendor: (out) (optional): Return location for return parameter or %NULL to ignore.
* @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
diff -Nru xfce4-power-manager-1.6.5/settings/xfce-power-manager-dbus.h xfce4-power-manager-1.6.6/settings/xfce-power-manager-dbus.h
--- xfce4-power-manager-1.6.5/settings/xfce-power-manager-dbus.h 2018-12-07 01:47:48.000000000 +0000
+++ xfce4-power-manager-1.6.6/settings/xfce-power-manager-dbus.h 2020-03-08 21:31:20.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.58.1 from org.xfce.Power.Manager.xml. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.60.4 from org.xfce.Power.Manager.xml. DO NOT EDIT.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
diff -Nru xfce4-power-manager-1.6.5/settings/xfpm-settings.c xfce4-power-manager-1.6.6/settings/xfpm-settings.c
--- xfce4-power-manager-1.6.5/settings/xfpm-settings.c 2019-08-11 22:42:25.000000000 +0000
+++ xfce4-power-manager-1.6.6/settings/xfpm-settings.c 2020-03-05 23:31:57.000000000 +0000
@@ -182,9 +182,6 @@
void brightness_on_ac_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-gboolean critical_spin_output_cb (GtkSpinButton *w,
- gpointer data);
-
void on_battery_lid_changed_cb (GtkWidget *w,
XfconfChannel *channel);
@@ -765,18 +762,6 @@
update_label (label_brightness_inactivity_on_ac, w, format_brightness_value_cb);
}
-gboolean
-critical_spin_output_cb (GtkSpinButton *w, gpointer data)
-{
- gint val = (gint) gtk_spin_button_get_value (w);
- gchar *text = g_strdup_printf ("%d %%", val);
-
- gtk_entry_set_text (GTK_ENTRY(w), text);
- g_free (text);
-
- return TRUE;
-}
-
void
on_battery_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
@@ -1584,7 +1569,6 @@
}
else
gtk_spin_button_set_value (GTK_SPIN_BUTTON(critical_level), val);
- critical_spin_output_cb (GTK_SPIN_BUTTON(critical_level), NULL);
}
else
{
diff -Nru xfce4-power-manager-1.6.5/src/Makefile.in xfce4-power-manager-1.6.6/src/Makefile.in
--- xfce4-power-manager-1.6.5/src/Makefile.in 2019-08-11 22:43:56.000000000 +0000
+++ xfce4-power-manager-1.6.6/src/Makefile.in 2020-03-08 21:31:10.000000000 +0000
@@ -497,6 +497,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -Nru xfce4-power-manager-1.6.5/src/org.freedesktop.PowerManagement.Inhibit.c xfce4-power-manager-1.6.6/src/org.freedesktop.PowerManagement.Inhibit.c
--- xfce4-power-manager-1.6.5/src/org.freedesktop.PowerManagement.Inhibit.c 2018-09-16 22:56:22.000000000 +0000
+++ xfce4-power-manager-1.6.6/src/org.freedesktop.PowerManagement.Inhibit.c 2019-11-11 08:38:30.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.58.0 from org.freedesktop.PowerManagement.Inhibit.xml. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.58.1 from org.freedesktop.PowerManagement.Inhibit.xml. DO NOT EDIT.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
@@ -186,10 +186,10 @@
FALSE
};
-static const _ExtendedGDBusArgInfo * const _xfpm_power_management_inhibit_method_info_inhibit_IN_ARG_pointers[] =
+static const GDBusArgInfo * const _xfpm_power_management_inhibit_method_info_inhibit_IN_ARG_pointers[] =
{
- &_xfpm_power_management_inhibit_method_info_inhibit_IN_ARG_application,
- &_xfpm_power_management_inhibit_method_info_inhibit_IN_ARG_reason,
+ &_xfpm_power_management_inhibit_method_info_inhibit_IN_ARG_application.parent_struct,
+ &_xfpm_power_management_inhibit_method_info_inhibit_IN_ARG_reason.parent_struct,
NULL
};
@@ -204,9 +204,9 @@
FALSE
};
-static const _ExtendedGDBusArgInfo * const _xfpm_power_management_inhibit_method_info_inhibit_OUT_ARG_pointers[] =
+static const GDBusArgInfo * const _xfpm_power_management_inhibit_method_info_inhibit_OUT_ARG_pointers[] =
{
- &_xfpm_power_management_inhibit_method_info_inhibit_OUT_ARG_cookie,
+ &_xfpm_power_management_inhibit_method_info_inhibit_OUT_ARG_cookie.parent_struct,
NULL
};
@@ -248,9 +248,9 @@
FALSE
};
-static const _ExtendedGDBusArgInfo * const _xfpm_power_management_inhibit_method_info_un_inhibit_IN_ARG_pointers[] =
+static const GDBusArgInfo * const _xfpm_power_management_inhibit_method_info_un_inhibit_IN_ARG_pointers[] =
{
- &_xfpm_power_management_inhibit_method_info_un_inhibit_IN_ARG_cookie,
+ &_xfpm_power_management_inhibit_method_info_un_inhibit_IN_ARG_cookie.parent_struct,
NULL
};
@@ -278,9 +278,9 @@
FALSE
};
-static const _ExtendedGDBusArgInfo * const _xfpm_power_management_inhibit_method_info_has_inhibit_OUT_ARG_pointers[] =
+static const GDBusArgInfo * const _xfpm_power_management_inhibit_method_info_has_inhibit_OUT_ARG_pointers[] =
{
- &_xfpm_power_management_inhibit_method_info_has_inhibit_OUT_ARG_has_inhibit,
+ &_xfpm_power_management_inhibit_method_info_has_inhibit_OUT_ARG_has_inhibit.parent_struct,
NULL
};
@@ -308,9 +308,9 @@
FALSE
};
-static const _ExtendedGDBusArgInfo * const _xfpm_power_management_inhibit_method_info_get_inhibitors_OUT_ARG_pointers[] =
+static const GDBusArgInfo * const _xfpm_power_management_inhibit_method_info_get_inhibitors_OUT_ARG_pointers[] =
{
- &_xfpm_power_management_inhibit_method_info_get_inhibitors_OUT_ARG_inhibitors,
+ &_xfpm_power_management_inhibit_method_info_get_inhibitors_OUT_ARG_inhibitors.parent_struct,
NULL
};
@@ -327,12 +327,12 @@
FALSE
};
-static const _ExtendedGDBusMethodInfo * const _xfpm_power_management_inhibit_method_info_pointers[] =
+static const GDBusMethodInfo * const _xfpm_power_management_inhibit_method_info_pointers[] =
{
- &_xfpm_power_management_inhibit_method_info_inhibit,
- &_xfpm_power_management_inhibit_method_info_un_inhibit,
- &_xfpm_power_management_inhibit_method_info_has_inhibit,
- &_xfpm_power_management_inhibit_method_info_get_inhibitors,
+ &_xfpm_power_management_inhibit_method_info_inhibit.parent_struct,
+ &_xfpm_power_management_inhibit_method_info_un_inhibit.parent_struct,
+ &_xfpm_power_management_inhibit_method_info_has_inhibit.parent_struct,
+ &_xfpm_power_management_inhibit_method_info_get_inhibitors.parent_struct,
NULL
};
@@ -347,9 +347,9 @@
FALSE
};
-static const _ExtendedGDBusArgInfo * const _xfpm_power_management_inhibit_signal_info_has_inhibit_changed_ARG_pointers[] =
+static const GDBusArgInfo * const _xfpm_power_management_inhibit_signal_info_has_inhibit_changed_ARG_pointers[] =
{
- &_xfpm_power_management_inhibit_signal_info_has_inhibit_changed_ARG_has_inhibit_changed,
+ &_xfpm_power_management_inhibit_signal_info_has_inhibit_changed_ARG_has_inhibit_changed.parent_struct,
NULL
};
@@ -364,9 +364,9 @@
"has-inhibit-changed"
};
-static const _ExtendedGDBusSignalInfo * const _xfpm_power_management_inhibit_signal_info_pointers[] =
+static const GDBusSignalInfo * const _xfpm_power_management_inhibit_signal_info_pointers[] =
{
- &_xfpm_power_management_inhibit_signal_info_has_inhibit_changed,
+ &_xfpm_power_management_inhibit_signal_info_has_inhibit_changed.parent_struct,
NULL
};
diff -Nru xfce4-power-manager-1.6.5/src/org.freedesktop.PowerManagement.Inhibit.h xfce4-power-manager-1.6.6/src/org.freedesktop.PowerManagement.Inhibit.h
--- xfce4-power-manager-1.6.5/src/org.freedesktop.PowerManagement.Inhibit.h 2018-09-16 22:56:22.000000000 +0000
+++ xfce4-power-manager-1.6.6/src/org.freedesktop.PowerManagement.Inhibit.h 2019-05-17 13:45:51.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.58.0 from org.freedesktop.PowerManagement.Inhibit.xml. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.58.1 from org.freedesktop.PowerManagement.Inhibit.xml. DO NOT EDIT.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
diff -Nru xfce4-power-manager-1.6.5/src/xfce-screensaver.c xfce4-power-manager-1.6.6/src/xfce-screensaver.c
--- xfce4-power-manager-1.6.5/src/xfce-screensaver.c 2019-08-02 03:30:20.000000000 +0000
+++ xfce4-power-manager-1.6.6/src/xfce-screensaver.c 2020-03-05 23:31:57.000000000 +0000
@@ -260,7 +260,7 @@
saver->priv->screensaver_type = SCREENSAVER_TYPE_GNOME;
} else if (screen_saver_proxy_setup (saver,
"org.xfce.ScreenSaver",
- "/org.xfce/ScreenSaver",
+ "/org/xfce/ScreenSaver",
"org.xfce.ScreenSaver"))
{
DBG ("using Xfce screensaver daemon");
diff -Nru xfce4-power-manager-1.6.5/src/xfpm-notify.c xfce4-power-manager-1.6.6/src/xfpm-notify.c
--- xfce4-power-manager-1.6.5/src/xfpm-notify.c 2019-04-14 20:07:12.000000000 +0000
+++ xfce4-power-manager-1.6.6/src/xfpm-notify.c 2020-03-05 23:03:29.000000000 +0000
@@ -345,8 +345,9 @@
void xfpm_notify_close_critical (XfpmNotify *notify)
{
- g_return_if_fail (XFPM_IS_NOTIFY (notify));
+ GError *error = NULL;
+ g_return_if_fail (XFPM_IS_NOTIFY (notify));
if (notify->priv->critical_id != 0)
{
@@ -356,8 +357,11 @@
if ( notify->priv->critical )
{
- if (!notify_notification_close (notify->priv->critical, NULL))
- g_warning ("Failed to close notification\n");
+ if (!notify_notification_close (notify->priv->critical, &error))
+ {
+ g_warning ("Failed to close critical notification: %s", error->message);
+ g_error_free (error);
+ }
g_object_unref (G_OBJECT(notify->priv->critical) );
notify->priv->critical = NULL;
diff -Nru xfce4-power-manager-1.6.5/src/xfpm-power.c xfce4-power-manager-1.6.6/src/xfpm-power.c
--- xfce4-power-manager-1.6.5/src/xfpm-power.c 2019-08-02 03:30:20.000000000 +0000
+++ xfce4-power-manager-1.6.6/src/xfpm-power.c 2020-03-05 23:03:29.000000000 +0000
@@ -249,6 +249,9 @@
xfpm_dpms_set_on_battery (power->priv->dpms, on_battery);
+ /* Dismiss critical notifications on battery state changes */
+ xfpm_notify_close_critical (power->priv->notify);
+
power->priv->on_battery = on_battery;
list = g_hash_table_get_values (power->priv->hash);
len = g_list_length (list);