diff -Nru xfce4-power-manager-1.6.5/aclocal.m4 xfce4-power-manager-1.6.6/aclocal.m4
--- xfce4-power-manager-1.6.5/aclocal.m4	2019-08-11 22:43:54.000000000 +0000
+++ xfce4-power-manager-1.6.6/aclocal.m4	2020-03-08 21:31:07.000000000 +0000
@@ -540,9 +540,9 @@
   AC_SUBST([USE_NLS])
 ])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
-
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -816,74 +816,6 @@
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------
-dnl
-dnl Prepare a "--with-" configure option using the lowercase
-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
-dnl PKG_CHECK_MODULES in a single macro.
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-
-m4_pushdef([description],
-           [m4_default([$5], [build with ]with_arg[ support])])
-
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
-            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
-            [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
-     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
-    [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
-            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
-            [auto],[PKG_CHECK_MODULES([$1],[$2],
-                                        [m4_n([def_action_if_found]) $3],
-                                        [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-])dnl PKG_WITH_MODULES
-
-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl -----------------------------------------------
-dnl
-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
-dnl check._[VARIABLE-PREFIX] is exported as make variable.
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
-[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-
-AM_CONDITIONAL([HAVE_][$1],
-               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])dnl PKG_HAVE_WITH_MODULES
-
-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------------------
-dnl
-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
-dnl and preprocessor variable.
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
-        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])dnl PKG_HAVE_DEFINE_WITH_MODULES
-
 # Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2225,7 +2157,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2018 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -2444,8 +2376,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -2947,7 +2879,6 @@
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -3259,8 +3190,8 @@
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
       echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
       cat > conftest.c << _LT_EOF
@@ -3710,22 +3641,9 @@
 m4_defun([_LT_PROG_AR],
 [AC_CHECK_TOOLS(AR, [ar], false)
 : ${AR=ar}
+: ${AR_FLAGS=cru}
 _LT_DECL([], [AR], [1], [The archiver])
-
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
-         [Flags to create an archive])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
 
 AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
   [lt_cv_ar_at_file=no
@@ -4437,35 +4355,26 @@
 striplib=
 old_striplib=
 AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -z "$STRIP"; then
-  AC_MSG_RESULT([no])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
 else
-  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-    old_striplib="$STRIP --strip-debug"
-    striplib="$STRIP --strip-unneeded"
-    AC_MSG_RESULT([yes])
-  else
-    case $host_os in
-    darwin*)
-      # FIXME - insert some real tests, host_os isn't really good enough
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       AC_MSG_RESULT([yes])
-      ;;
-    freebsd*)
-      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
-        old_striplib="$STRIP --strip-debug"
-        striplib="$STRIP --strip-unneeded"
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-      fi
-      ;;
-    *)
+    else
       AC_MSG_RESULT([no])
-      ;;
-    esac
-  fi
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
 fi
 _LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 _LT_DECL([], [striplib], [1])
@@ -4804,8 +4713,8 @@
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl*)
+    # Native MSVC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -4861,7 +4770,7 @@
     ;;
 
   *)
-    # Assume MSVC and ICC wrapper
+    # Assume MSVC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -5126,6 +5035,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -5785,7 +5706,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -6249,7 +6170,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
@@ -6291,7 +6212,8 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6663,7 +6585,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -6931,6 +6853,12 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
@@ -7158,7 +7086,7 @@
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
     else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
@@ -7166,7 +7094,7 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl* | icl*)
+    cl*)
       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -7175,6 +7103,9 @@
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -7223,20 +7154,23 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++ or Intel C++ Compiler.
+    # Microsoft Visual C++.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -7395,7 +7329,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     interix[[3-9]]*)
@@ -7492,7 +7425,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -7613,7 +7546,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -7796,12 +7729,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++ or Intel C++ Compiler.
+      # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl*)
+	# Native MSVC
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -7842,7 +7775,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC and ICC wrapper
+	# Assume MSVC wrapper
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -8013,6 +7946,7 @@
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -8034,7 +7968,7 @@
       esac
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -8101,7 +8035,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='@'
       ;;
 
     osf3*)
@@ -8657,7 +8590,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
     else
       GXX=no
@@ -8868,8 +8801,8 @@
 
       cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	  # Native MSVC or ICC
+	,cl* | no,cl*)
+	  # Native MSVC
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -8967,7 +8900,6 @@
 	  emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
 
       dgux*)
@@ -9033,7 +8965,7 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -9098,7 +9030,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test yes = "$GXX"; then
@@ -9437,7 +9369,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -9521,7 +9453,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@@ -9532,7 +9464,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
@@ -10598,7 +10530,7 @@
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2018 Free Software
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
@@ -11030,7 +10962,7 @@
 
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2018 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
@@ -11155,7 +11087,7 @@
 
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -11164,22 +11096,22 @@
 
 # @configure_input@
 
-# serial 4221 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce])
-m4_define([LT_PACKAGE_REVISION], [2.4.6.42])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.42-b88ce'
-macro_revision='2.4.6.42'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
 
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2018 Free Software
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
diff -Nru xfce4-power-manager-1.6.5/ChangeLog xfce4-power-manager-1.6.6/ChangeLog
--- xfce4-power-manager-1.6.5/ChangeLog	2019-08-11 22:44:03.000000000 +0000
+++ xfce4-power-manager-1.6.6/ChangeLog	2020-03-08 21:31:19.000000000 +0000
@@ -1,3 +1,77 @@
+commit 058e1a88d8b73d9c8bfd7a1c194c7ebb1e6652db
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Fri Mar 6 00:26:53 2020 +0100
+
+    panel-plugin: Add missing about callback
+    
+    This should have been part of the cherry-picked 299381a5142f20934305741050f003735da0d740
+
+commit b2a20cbe0233f8b96a5d8f59a3bf683b069a0760
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sat Sep 28 00:00:03 2019 +0200
+
+    panel-plugin: Replace deprecated call
+    
+    Preparation for xfce4-panel 4.16
+
+commit 853b94e0a1efd1f07edf1f86c5ecdf939527a94d
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sat Sep 28 00:00:33 2019 +0200
+
+    settings: Move % sign out of spinbutton (Bug #15994)
+
+commit 042d684bf35fcc2033ffcbe3a338a66c6e446bd9
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Thu Nov 7 01:06:14 2019 +0100
+
+    Switch to symbolic window-close icons
+
+commit d2f1c7977dc55bc799e3e715f34282943251aebc
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Mon Nov 11 09:27:03 2019 +0100
+
+    panel-plugin: Toggle presentation mode on middle click
+
+commit 971112acdd22954f2b9d1b690e85ba52cfd73d89
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Mon Jan 27 00:15:18 2020 +0100
+
+    panel-plugin: Properly hook up about signal
+
+commit 0a40699d6ef0fe153a879ab3df69c52de7292547
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sun Jan 26 23:57:45 2020 +0100
+
+    panel-plugin: Properly show 'About' menu item
+
+commit 26d621a8d30c1c2d0fcf56fd89379ef8f9f8ada6
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sat Jan 11 00:51:48 2020 +0100
+
+    Fix inhibiting xfce4-screensaver (Bug #16364)
+
+commit e131a6626e7d89260de3e8a88629393ecfea4cab
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sat Jan 11 00:59:35 2020 +0100
+
+    Back to development
+
+commit ecee3888bea0468fd8c338efd00359dfcb28bdb0
+Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
+Date:   Sun Nov 10 00:33:58 2019 +0100
+
+    Dismiss critical notification when connecting to AC
+    
+    We can most likely dismiss the critical notification on all battery state changes,
+    because if there still is one around it means we just connected to a power source
+    (critical notifications always get cleared before new ones are spawned).
+
+commit b9a6d53aabe8bbf79f6a1629616cbf694d4b651a
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Aug 11 19:46:19 2019 -0300
+
+    Updates for release
+
 commit cea771dfc4f2662c4fed097f57715de6a365972b
 Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
 Date:   Sun Aug 11 12:31:02 2019 +0200
diff -Nru xfce4-power-manager-1.6.5/common/Makefile.in xfce4-power-manager-1.6.6/common/Makefile.in
--- xfce4-power-manager-1.6.5/common/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/common/Makefile.in	2020-03-08 21:31:09.000000000 +0000
@@ -393,6 +393,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/common/xfpm-enum-types.c xfce4-power-manager-1.6.6/common/xfpm-enum-types.c
--- xfce4-power-manager-1.6.5/common/xfpm-enum-types.c	2018-09-16 22:56:20.000000000 +0000
+++ xfce4-power-manager-1.6.6/common/xfpm-enum-types.c	2019-11-11 08:38:30.000000000 +0000
@@ -8,106 +8,106 @@
 GType
 xfpm_battery_charge_get_type (void)
 {
-	static GType type = 0;
-	if (type == 0) {
-	static const GEnumValue values[] = {
-	{ XFPM_BATTERY_CHARGE_UNKNOWN, "XFPM_BATTERY_CHARGE_UNKNOWN", "unknown" },
-	{ XFPM_BATTERY_CHARGE_CRITICAL, "XFPM_BATTERY_CHARGE_CRITICAL", "critical" },
-	{ XFPM_BATTERY_CHARGE_LOW, "XFPM_BATTERY_CHARGE_LOW", "low" },
-	{ XFPM_BATTERY_CHARGE_OK, "XFPM_BATTERY_CHARGE_OK", "ok" },
-	{ 0, NULL, NULL }
-	};
-	type = g_enum_register_static ("XfpmBatteryCharge", values);
+  static GType type = 0;
+  if (type == 0) {
+  static const GEnumValue values[] = {
+  { XFPM_BATTERY_CHARGE_UNKNOWN, "XFPM_BATTERY_CHARGE_UNKNOWN", "unknown" },
+  { XFPM_BATTERY_CHARGE_CRITICAL, "XFPM_BATTERY_CHARGE_CRITICAL", "critical" },
+  { XFPM_BATTERY_CHARGE_LOW, "XFPM_BATTERY_CHARGE_LOW", "low" },
+  { XFPM_BATTERY_CHARGE_OK, "XFPM_BATTERY_CHARGE_OK", "ok" },
+  { 0, NULL, NULL }
+  };
+  type = g_enum_register_static ("XfpmBatteryCharge", values);
   }
-	return type;
+  return type;
 }
 GType
 xfpm_shutdown_request_get_type (void)
 {
-	static GType type = 0;
-	if (type == 0) {
-	static const GEnumValue values[] = {
-	{ XFPM_DO_NOTHING, "XFPM_DO_NOTHING", "do-nothing" },
-	{ XFPM_DO_SUSPEND, "XFPM_DO_SUSPEND", "do-suspend" },
-	{ XFPM_DO_HIBERNATE, "XFPM_DO_HIBERNATE", "do-hibernate" },
-	{ XFPM_ASK, "XFPM_ASK", "ask" },
-	{ XFPM_DO_SHUTDOWN, "XFPM_DO_SHUTDOWN", "do-shutdown" },
-	{ 0, NULL, NULL }
-	};
-	type = g_enum_register_static ("XfpmShutdownRequest", values);
+  static GType type = 0;
+  if (type == 0) {
+  static const GEnumValue values[] = {
+  { XFPM_DO_NOTHING, "XFPM_DO_NOTHING", "do-nothing" },
+  { XFPM_DO_SUSPEND, "XFPM_DO_SUSPEND", "do-suspend" },
+  { XFPM_DO_HIBERNATE, "XFPM_DO_HIBERNATE", "do-hibernate" },
+  { XFPM_ASK, "XFPM_ASK", "ask" },
+  { XFPM_DO_SHUTDOWN, "XFPM_DO_SHUTDOWN", "do-shutdown" },
+  { 0, NULL, NULL }
+  };
+  type = g_enum_register_static ("XfpmShutdownRequest", values);
   }
-	return type;
+  return type;
 }
 GType
 xfpm_lid_trigger_action_get_type (void)
 {
-	static GType type = 0;
-	if (type == 0) {
-	static const GEnumValue values[] = {
-	{ LID_TRIGGER_NOTHING, "LID_TRIGGER_NOTHING", "nothing" },
-	{ LID_TRIGGER_SUSPEND, "LID_TRIGGER_SUSPEND", "suspend" },
-	{ LID_TRIGGER_HIBERNATE, "LID_TRIGGER_HIBERNATE", "hibernate" },
-	{ LID_TRIGGER_LOCK_SCREEN, "LID_TRIGGER_LOCK_SCREEN", "lock-screen" },
-	{ 0, NULL, NULL }
-	};
-	type = g_enum_register_static ("XfpmLidTriggerAction", values);
+  static GType type = 0;
+  if (type == 0) {
+  static const GEnumValue values[] = {
+  { LID_TRIGGER_NOTHING, "LID_TRIGGER_NOTHING", "nothing" },
+  { LID_TRIGGER_SUSPEND, "LID_TRIGGER_SUSPEND", "suspend" },
+  { LID_TRIGGER_HIBERNATE, "LID_TRIGGER_HIBERNATE", "hibernate" },
+  { LID_TRIGGER_LOCK_SCREEN, "LID_TRIGGER_LOCK_SCREEN", "lock-screen" },
+  { 0, NULL, NULL }
+  };
+  type = g_enum_register_static ("XfpmLidTriggerAction", values);
   }
-	return type;
+  return type;
 }
 GType
 xfpm_button_key_get_type (void)
 {
-	static GType type = 0;
-	if (type == 0) {
-	static const GEnumValue values[] = {
-	{ BUTTON_UNKNOWN, "BUTTON_UNKNOWN", "button-unknown" },
-	{ BUTTON_POWER_OFF, "BUTTON_POWER_OFF", "button-power-off" },
-	{ BUTTON_HIBERNATE, "BUTTON_HIBERNATE", "button-hibernate" },
-	{ BUTTON_SLEEP, "BUTTON_SLEEP", "button-sleep" },
-	{ BUTTON_MON_BRIGHTNESS_UP, "BUTTON_MON_BRIGHTNESS_UP", "button-mon-brightness-up" },
-	{ BUTTON_MON_BRIGHTNESS_DOWN, "BUTTON_MON_BRIGHTNESS_DOWN", "button-mon-brightness-down" },
-	{ BUTTON_LID_CLOSED, "BUTTON_LID_CLOSED", "button-lid-closed" },
-	{ BUTTON_BATTERY, "BUTTON_BATTERY", "button-battery" },
-	{ BUTTON_KBD_BRIGHTNESS_UP, "BUTTON_KBD_BRIGHTNESS_UP", "button-kbd-brightness-up" },
-	{ BUTTON_KBD_BRIGHTNESS_DOWN, "BUTTON_KBD_BRIGHTNESS_DOWN", "button-kbd-brightness-down" },
-	{ NUMBER_OF_BUTTONS, "NUMBER_OF_BUTTONS", "number-of-buttons" },
-	{ 0, NULL, NULL }
-	};
-	type = g_enum_register_static ("XfpmButtonKey", values);
+  static GType type = 0;
+  if (type == 0) {
+  static const GEnumValue values[] = {
+  { BUTTON_UNKNOWN, "BUTTON_UNKNOWN", "button-unknown" },
+  { BUTTON_POWER_OFF, "BUTTON_POWER_OFF", "button-power-off" },
+  { BUTTON_HIBERNATE, "BUTTON_HIBERNATE", "button-hibernate" },
+  { BUTTON_SLEEP, "BUTTON_SLEEP", "button-sleep" },
+  { BUTTON_MON_BRIGHTNESS_UP, "BUTTON_MON_BRIGHTNESS_UP", "button-mon-brightness-up" },
+  { BUTTON_MON_BRIGHTNESS_DOWN, "BUTTON_MON_BRIGHTNESS_DOWN", "button-mon-brightness-down" },
+  { BUTTON_LID_CLOSED, "BUTTON_LID_CLOSED", "button-lid-closed" },
+  { BUTTON_BATTERY, "BUTTON_BATTERY", "button-battery" },
+  { BUTTON_KBD_BRIGHTNESS_UP, "BUTTON_KBD_BRIGHTNESS_UP", "button-kbd-brightness-up" },
+  { BUTTON_KBD_BRIGHTNESS_DOWN, "BUTTON_KBD_BRIGHTNESS_DOWN", "button-kbd-brightness-down" },
+  { NUMBER_OF_BUTTONS, "NUMBER_OF_BUTTONS", "number-of-buttons" },
+  { 0, NULL, NULL }
+  };
+  type = g_enum_register_static ("XfpmButtonKey", values);
   }
-	return type;
+  return type;
 }
 GType
 xfpm_spindown_request_get_type (void)
 {
-	static GType type = 0;
-	if (type == 0) {
-	static const GEnumValue values[] = {
-	{ SPIN_DOWN_HDD_NEVER, "SPIN_DOWN_HDD_NEVER", "never" },
-	{ SPIN_DOWN_HDD_ON_BATTERY, "SPIN_DOWN_HDD_ON_BATTERY", "on-battery" },
-	{ SPIN_DOWN_HDD_PLUGGED_IN, "SPIN_DOWN_HDD_PLUGGED_IN", "plugged-in" },
-	{ SPIN_DOWN_HDD_ALWAYS, "SPIN_DOWN_HDD_ALWAYS", "always" },
-	{ 0, NULL, NULL }
-	};
-	type = g_enum_register_static ("XfpmSpindownRequest", values);
+  static GType type = 0;
+  if (type == 0) {
+  static const GEnumValue values[] = {
+  { SPIN_DOWN_HDD_NEVER, "SPIN_DOWN_HDD_NEVER", "never" },
+  { SPIN_DOWN_HDD_ON_BATTERY, "SPIN_DOWN_HDD_ON_BATTERY", "on-battery" },
+  { SPIN_DOWN_HDD_PLUGGED_IN, "SPIN_DOWN_HDD_PLUGGED_IN", "plugged-in" },
+  { SPIN_DOWN_HDD_ALWAYS, "SPIN_DOWN_HDD_ALWAYS", "always" },
+  { 0, NULL, NULL }
+  };
+  type = g_enum_register_static ("XfpmSpindownRequest", values);
   }
-	return type;
+  return type;
 }
 GType
 xfpm_show_icon_get_type (void)
 {
-	static GType type = 0;
-	if (type == 0) {
-	static const GEnumValue values[] = {
-	{ SHOW_ICON_ALWAYS, "SHOW_ICON_ALWAYS", "show-icon-always" },
-	{ SHOW_ICON_WHEN_BATTERY_PRESENT, "SHOW_ICON_WHEN_BATTERY_PRESENT", "show-icon-when-battery-present" },
-	{ SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING, "SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING", "show-icon-when-battery-charging-discharging" },
-	{ NEVER_SHOW_ICON, "NEVER_SHOW_ICON", "never-show-icon" },
-	{ 0, NULL, NULL }
-	};
-	type = g_enum_register_static ("XfpmShowIcon", values);
+  static GType type = 0;
+  if (type == 0) {
+  static const GEnumValue values[] = {
+  { SHOW_ICON_ALWAYS, "SHOW_ICON_ALWAYS", "show-icon-always" },
+  { SHOW_ICON_WHEN_BATTERY_PRESENT, "SHOW_ICON_WHEN_BATTERY_PRESENT", "show-icon-when-battery-present" },
+  { SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING, "SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING", "show-icon-when-battery-charging-discharging" },
+  { NEVER_SHOW_ICON, "NEVER_SHOW_ICON", "never-show-icon" },
+  { 0, NULL, NULL }
+  };
+  type = g_enum_register_static ("XfpmShowIcon", values);
   }
-	return type;
+  return type;
 }
 
 /* Generated data ends here */
diff -Nru xfce4-power-manager-1.6.5/config.guess xfce4-power-manager-1.6.6/config.guess
--- xfce4-power-manager-1.6.5/config.guess	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/config.guess	2020-03-08 21:31:09.000000000 +0000
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-03-08'
+timestamp='2018-02-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1046,7 +1046,11 @@
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+	else
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	fi
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1469,7 +1473,7 @@
 exit 1
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff -Nru xfce4-power-manager-1.6.5/config.sub xfce4-power-manager-1.6.6/config.sub
--- xfce4-power-manager-1.6.5/config.sub	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/config.sub	2020-03-08 21:31:09.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-03-08'
+timestamp='2018-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1376,7 +1376,7 @@
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
@@ -1794,7 +1794,7 @@
 exit
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff -Nru xfce4-power-manager-1.6.5/configure xfce4-power-manager-1.6.6/configure
--- xfce4-power-manager-1.6.5/configure	2019-08-11 22:43:56.000000000 +0000
+++ xfce4-power-manager-1.6.6/configure	2020-03-08 21:31:10.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-power-manager 1.6.5.
+# Generated by GNU Autoconf 2.69 for xfce4-power-manager 1.6.6.
 #
 # Report bugs to <http://bugzilla.xfce.org/>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='xfce4-power-manager'
 PACKAGE_TARNAME='xfce4-power-manager'
-PACKAGE_VERSION='1.6.5'
-PACKAGE_STRING='xfce4-power-manager 1.6.5'
+PACKAGE_VERSION='1.6.6'
+PACKAGE_STRING='xfce4-power-manager 1.6.6'
 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
 PACKAGE_URL=''
 
@@ -857,6 +857,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -953,6 +954,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1205,6 +1207,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1342,7 +1353,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1455,7 +1466,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 xfce4-power-manager 1.6.5 to adapt to many kinds of systems.
+\`configure' configures xfce4-power-manager 1.6.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1495,6 +1506,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1530,7 +1542,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xfce4-power-manager 1.6.5:";;
+     short | recursive ) echo "Configuration of xfce4-power-manager 1.6.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,7 +1678,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xfce4-power-manager configure 1.6.5
+xfce4-power-manager configure 1.6.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2081,7 +2093,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xfce4-power-manager $as_me 1.6.5, which was
+It was created by xfce4-power-manager $as_me 1.6.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2949,7 +2961,7 @@
 
 # Define the identity of the package.
  PACKAGE='xfce4-power-manager'
- VERSION='1.6.5'
+ VERSION='1.6.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6410,8 +6422,8 @@
 
 
 
-macro_version='2.4.6.42-b88ce'
-macro_revision='2.4.6.42'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -7178,7 +7190,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -7540,29 +7552,13 @@
 fi
 
 : ${AR=ar}
+: ${AR_FLAGS=cru}
 
 
 
 
 
 
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-
-
-
-
-
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-
 
 
 
@@ -8011,7 +8007,7 @@
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+    # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
@@ -8057,11 +8053,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -9280,8 +9273,8 @@
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
-      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
@@ -9676,8 +9669,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -10138,6 +10131,12 @@
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
@@ -10600,20 +10599,23 @@
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++ or Intel C++ Compiler.
+    # Microsoft Visual C++.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -10772,7 +10774,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
-      file_list_spec='@'
       ;;
 
     interix[3-9]*)
@@ -10869,7 +10870,7 @@
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -10990,7 +10991,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -11257,12 +11258,12 @@
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++ or Intel C++ Compiler.
+      # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
+      cl*)
+	# Native MSVC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -11303,7 +11304,7 @@
           fi'
 	;;
       *)
-	# Assume MSVC and ICC wrapper
+	# Assume MSVC wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -11539,6 +11540,7 @@
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
+	link_all_deplibs=no
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -11560,7 +11562,7 @@
       esac
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -11627,7 +11629,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
-      file_list_spec='@'
       ;;
 
     osf3*)
@@ -12335,8 +12336,8 @@
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
+  *,cl*)
+    # Native MSVC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -12392,7 +12393,7 @@
     ;;
 
   *)
-    # Assume MSVC and ICC wrapper
+    # Assume MSVC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
@@ -12676,6 +12677,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -13571,41 +13584,30 @@
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -z "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-    old_striplib="$STRIP --strip-debug"
-    striplib="$STRIP --strip-unneeded"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  else
-    case $host_os in
-    darwin*)
-      # FIXME - insert some real tests, host_os isn't really good enough
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-      ;;
-    freebsd*)
-      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
-        old_striplib="$STRIP --strip-debug"
-        striplib="$STRIP --strip-unneeded"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-      ;;
-    *)
+    else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      ;;
-    esac
-  fi
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
 fi
 
 
@@ -13903,7 +13905,7 @@
 
 
 
-    ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es et eu fi fr gl he hr hu hy_AM id ie is it ja kk kn ko lt ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW "
+    ALL_LINGUAS="ar ast be bg ca cs da de el en_AU en_GB es et eu fi fr gl he hr hu hy_AM id ie is it ja kk kn ko lt ms nb nl nn oc pa pl pt pt_BR ro ru si sk sl sq sr sv te th tr ug uk ur ur_PK vi zh_CN zh_HK zh_TW "
 
    for ac_header in locale.h
 do :
@@ -18979,7 +18981,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfce4-power-manager $as_me 1.6.5, which was
+This file was extended by xfce4-power-manager $as_me 1.6.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19045,7 +19047,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xfce4-power-manager config.status 1.6.5
+xfce4-power-manager config.status 1.6.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19216,7 +19218,6 @@
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
@@ -19345,6 +19346,7 @@
 DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
+AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -20183,7 +20185,6 @@
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -20327,11 +20328,8 @@
 # The archiver.
 AR=$lt_AR
 
-# Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
-
 # Flags to create an archive.
-AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
+AR_FLAGS=$lt_AR_FLAGS
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
diff -Nru xfce4-power-manager-1.6.5/configure.ac xfce4-power-manager-1.6.6/configure.ac
--- xfce4-power-manager-1.6.5/configure.ac	2019-08-11 22:43:51.000000000 +0000
+++ xfce4-power-manager-1.6.6/configure.ac	2020-03-08 21:31:03.000000000 +0000
@@ -6,8 +6,8 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major], [1])
 m4_define([xfpm_version_minor], [6])
-m4_define([xfpm_version_micro], [5])
-m4_define([xfpm_version_build], [cea771df])
+m4_define([xfpm_version_micro], [6])
+m4_define([xfpm_version_build], [058e1a88])
 m4_define([xfpm_version_tag], [])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [git], [xfpm_version_tag()-xfpm_version_build()], [xfpm_version_tag()])])
 
@@ -60,7 +60,7 @@
 # 		Check for i18n support 			#
 # ===================================================== #
 
-XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es et eu fi fr gl he hr hu hy_AM id ie is it ja kk kn ko lt ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW ])
+XDT_I18N([ar ast be bg ca cs da de el en_AU en_GB es et eu fi fr gl he hr hu hy_AM id ie is it ja kk kn ko lt ms nb nl nn oc pa pl pt pt_BR ro ru si sk sl sq sr sv te th tr ug uk ur ur_PK vi zh_CN zh_HK zh_TW ])
 
 # ===================================================== #
 # 		Check for X11 support 			#
diff -Nru xfce4-power-manager-1.6.5/data/appdata/Makefile.in xfce4-power-manager-1.6.6/data/appdata/Makefile.in
--- xfce4-power-manager-1.6.5/data/appdata/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/appdata/Makefile.in	2020-03-08 21:31:09.000000000 +0000
@@ -356,6 +356,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/data/icons/32x32/Makefile.in xfce4-power-manager-1.6.6/data/icons/32x32/Makefile.in
--- xfce4-power-manager-1.6.5/data/icons/32x32/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/icons/32x32/Makefile.in	2020-03-08 21:31:09.000000000 +0000
@@ -356,6 +356,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/data/icons/48x48/Makefile.in xfce4-power-manager-1.6.6/data/icons/48x48/Makefile.in
--- xfce4-power-manager-1.6.5/data/icons/48x48/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/icons/48x48/Makefile.in	2020-03-08 21:31:09.000000000 +0000
@@ -356,6 +356,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/data/icons/Makefile.in xfce4-power-manager-1.6.6/data/icons/Makefile.in
--- xfce4-power-manager-1.6.5/data/icons/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/icons/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/data/icons/scalable/Makefile.in xfce4-power-manager-1.6.6/data/icons/scalable/Makefile.in
--- xfce4-power-manager-1.6.5/data/icons/scalable/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/icons/scalable/Makefile.in	2020-03-08 21:31:09.000000000 +0000
@@ -356,6 +356,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/data/interfaces/Makefile.in xfce4-power-manager-1.6.6/data/interfaces/Makefile.in
--- xfce4-power-manager-1.6.5/data/interfaces/Makefile.in	2019-08-11 22:43:55.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/interfaces/Makefile.in	2020-03-08 21:31:09.000000000 +0000
@@ -326,6 +326,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/data/interfaces/xfpm-settings.ui xfce4-power-manager-1.6.6/data/interfaces/xfpm-settings.ui
--- xfce4-power-manager-1.6.5/data/interfaces/xfpm-settings.ui	2019-08-11 22:42:25.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/interfaces/xfpm-settings.ui	2020-03-05 23:31:57.000000000 +0000
@@ -82,7 +82,7 @@
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">window-close</property>
+    <property name="icon_name">window-close-symbolic</property>
   </object>
   <object class="GtkAdjustment" id="light-locker-late-locking-adjustment">
     <property name="lower">1</property>
@@ -296,8 +296,8 @@
           <object class="GtkBox" id="plug-child">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
             <property name="border_width">6</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkNotebook" id="main-notebook">
                 <property name="visible">True</property>
@@ -319,9 +319,9 @@
                           <object class="GtkBox" id="vbox2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">18</property>
-                            <property name="margin_start">18</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
@@ -334,8 +334,8 @@
                                   <object class="GtkLabel" id="button-power-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">When power button is pressed:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -346,8 +346,8 @@
                                   <object class="GtkLabel" id="button-sleep-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">When sleep button is pressed:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -358,8 +358,8 @@
                                   <object class="GtkLabel" id="button-hibernate-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">When hibernate button is pressed:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -370,8 +370,8 @@
                                   <object class="GtkLabel" id="button-battery-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">When battery button is pressed:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -465,10 +465,10 @@
                                   <object class="GtkLabel" id="handle-brightness-keys-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Handle display brightness _keys</property>
                                     <property name="use_underline">True</property>
                                     <property name="ellipsize">end</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -509,10 +509,10 @@
                           <object class="GtkGrid" id="table5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">3</property>
                             <property name="margin_bottom">18</property>
-                            <property name="margin_start">18</property>
+                            <property name="row_spacing">6</property>
                             <property name="column_spacing">18</property>
                             <child>
                               <object class="GtkLabel" id="lid-on-battery-header">
@@ -542,8 +542,8 @@
                               <object class="GtkLabel" id="lid-action-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">When laptop lid is closed:</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -616,35 +616,23 @@
                           <object class="GtkBox" id="vbox10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">18</property>
-                            <property name="margin_start">18</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkBox" id="hbox20">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkSwitch" id="show-notifications">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="halign">end</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <object class="GtkLabel" id="show-notifications-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Status notifications</property>
                                     <property name="use_underline">True</property>
                                     <property name="ellipsize">end</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -652,19 +640,8 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="hbox21">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkSwitch" id="show-systray">
+                                  <object class="GtkSwitch" id="show-notifications">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">end</property>
@@ -675,14 +652,25 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="hbox21">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" id="show-systray-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">System tray icon</property>
                                     <property name="use_underline">True</property>
                                     <property name="ellipsize">end</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -690,6 +678,18 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkSwitch" id="show-systray">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="halign">end</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -747,12 +747,12 @@
                           <object class="GtkGrid" id="table2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">18</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">6</property>
-                            <property name="margin_start">18</property>
-                            <property name="column-homogeneous">True</property>
+                            <property name="row_spacing">6</property>
+                            <property name="column_spacing">18</property>
+                            <property name="column_homogeneous">True</property>
                             <child>
                               <object class="GtkLabel" id="system-sleep-on-battery-header">
                                 <property name="visible">True</property>
@@ -781,8 +781,8 @@
                               <object class="GtkLabel" id="system-sleep-inactivity-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">When inactive for</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -801,20 +801,30 @@
                                     <property name="adjustment">system-sleep-inactivity-on-battery-adjustment</property>
                                     <property name="round_digits">0</property>
                                     <property name="digits">0</property>
-                                    <property name="draw-value">False</property>
+                                    <property name="draw_value">False</property>
                                     <signal name="value-changed" handler="inactivity_on_battery_value_changed_cb" swapped="no"/>
                                     <style>
                                       <class name="xfce4-scale-label"/>
                                     </style>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="system-sleep-inactivity-on-battery-label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="sensitive">False</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0.5</property>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
@@ -834,23 +844,29 @@
                                     <property name="adjustment">system-sleep-inactivity-on-ac-adjustment</property>
                                     <property name="round_digits">0</property>
                                     <property name="digits">0</property>
-                                    <property name="draw-value">False</property>
+                                    <property name="draw_value">False</property>
                                     <signal name="value-changed" handler="inactivity_on_ac_value_changed_cb" swapped="no"/>
                                     <style>
                                       <class name="xfce4-scale-label"/>
                                     </style>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="system-sleep-inactivity-on-ac-label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="sensitive">False</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0.5</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
                                     <property name="fill">True</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
@@ -863,8 +879,8 @@
                               <object class="GtkLabel" id="system-sleep-mode-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">System sleep mode:</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -937,11 +953,11 @@
                           <object class="GtkBox" id="vbox4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">3</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">12</property>
-                            <property name="margin_start">18</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">3</property>
                             <child>
                               <object class="GtkBox" id="hbox2">
                                 <property name="visible">True</property>
@@ -951,8 +967,8 @@
                                   <object class="GtkLabel" id="critical-power-level-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Critical battery power level:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -962,15 +978,14 @@
                                 </child>
                                 <child>
                                   <object class="GtkSpinButton" id="critical-power-level-spin">
+                                    <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">●</property>
+                                    <property name="width_chars">6</property>
                                     <property name="primary_icon_activatable">False</property>
                                     <property name="secondary_icon_activatable">False</property>
                                     <property name="adjustment">critical-power-level-spin-adjustment</property>
-                                    <property name="width-chars">6</property>
-                                    <property name="width-request">100</property>
-                                    <signal name="output" handler="critical_spin_output_cb" swapped="no"/>
                                     <signal name="value-changed" handler="critical_level_value_changed_cb" swapped="no"/>
                                   </object>
                                   <packing>
@@ -979,6 +994,18 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">%</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -995,8 +1022,8 @@
                                   <object class="GtkLabel" id="critical-power-action-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">On critical battery power:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1056,11 +1083,11 @@
                           <object class="GtkBox" id="vbox11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
+                            <property name="margin_start">6</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">12</property>
-                            <property name="margin_start">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="lock-screen">
                                 <property name="label" translatable="yes">Lock screen when system is going to sleep</property>
@@ -1163,10 +1190,10 @@
                           <object class="GtkBox" id="hbox7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">12</property>
                             <property name="margin_bottom">12</property>
-                            <property name="margin_start">18</property>
+                            <property name="spacing">6</property>
                             <child>
                               <object class="GtkBox" id="vbox13">
                                 <property name="visible">True</property>
@@ -1177,8 +1204,8 @@
                                   <object class="GtkLabel" id="display-blank-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Blank after</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -1190,8 +1217,8 @@
                                   <object class="GtkLabel" id="dpms-sleep-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Put to sleep after</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -1203,8 +1230,8 @@
                                   <object class="GtkLabel" id="dpms-off-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Switch off after</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -1240,9 +1267,9 @@
                                           <object class="GtkLabel" id="dpms-on-battery-header">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="yalign">1</property>
                                             <property name="label" translatable="yes">On battery</property>
                                             <property name="use_markup">True</property>
+                                            <property name="yalign">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
@@ -1262,20 +1289,30 @@
                                                 <property name="adjustment">display-blank-on-battery-adjustment</property>
                                                 <property name="round_digits">0</property>
                                                 <property name="digits">0</property>
-                                                <property name="draw-value">False</property>
+                                                <property name="draw_value">False</property>
                                                 <signal name="value-changed" handler="display_blank_on_battery_value_changed_cb" swapped="no"/>
                                                 <style>
                                                   <class name="xfce4-scale-label"/>
                                                 </style>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="display-blank-on-battery-label">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="sensitive">False</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0.5</property>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
@@ -1300,9 +1337,9 @@
                                           <object class="GtkLabel" id="dpms-plugged-in-header">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="yalign">1</property>
                                             <property name="label" translatable="yes">Plugged in</property>
                                             <property name="use_markup">True</property>
+                                            <property name="yalign">1</property>
                                           </object>
                                           <packing>
                                             <property name="expand">True</property>
@@ -1322,20 +1359,30 @@
                                                 <property name="adjustment">display-blank-on-ac-adjustment</property>
                                                 <property name="round_digits">0</property>
                                                 <property name="digits">0</property>
-                                                <property name="draw-value">False</property>
+                                                <property name="draw_value">False</property>
                                                 <signal name="value-changed" handler="display_blank_on_ac_value_changed_cb" swapped="no"/>
                                                 <style>
                                                   <class name="xfce4-scale-label"/>
                                                 </style>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="display-blank-on-ac-label">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="sensitive">False</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0.5</property>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
@@ -1362,9 +1409,9 @@
                                   <object class="GtkBox" id="hbox10">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="valign">center</property>
                                     <property name="spacing">6</property>
                                     <property name="homogeneous">True</property>
-                                    <property name="valign">center</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property name="visible">True</property>
@@ -1377,20 +1424,30 @@
                                             <property name="adjustment">dpms-sleep-on-battery-adjustment</property>
                                             <property name="round_digits">0</property>
                                             <property name="digits">0</property>
-                                            <property name="draw-value">False</property>
+                                            <property name="draw_value">False</property>
                                             <signal name="value-changed" handler="sleep_on_battery_value_changed_cb" swapped="no"/>
                                             <style>
                                               <class name="xfce4-scale-label"/>
                                             </style>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="dpms-sleep-on-battery-label">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="sensitive">False</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0.5</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -1411,20 +1468,30 @@
                                             <property name="adjustment">dpms-sleep-on-ac-adjustment</property>
                                             <property name="round_digits">0</property>
                                             <property name="digits">0</property>
-                                            <property name="draw-value">False</property>
+                                            <property name="draw_value">False</property>
                                             <signal name="value-changed" handler="sleep_on_ac_value_changed_cb" swapped="no"/>
                                             <style>
                                               <class name="xfce4-scale-label"/>
                                             </style>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="dpms-sleep-on-ac-label">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="sensitive">False</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0.5</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -1444,9 +1511,9 @@
                                   <object class="GtkBox" id="hbox11">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="valign">center</property>
                                     <property name="spacing">6</property>
                                     <property name="homogeneous">True</property>
-                                    <property name="valign">center</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property name="visible">True</property>
@@ -1459,20 +1526,30 @@
                                             <property name="adjustment">dpms-off-on-battery-adjustment</property>
                                             <property name="round_digits">0</property>
                                             <property name="digits">0</property>
-                                            <property name="draw-value">False</property>
+                                            <property name="draw_value">False</property>
                                             <signal name="value-changed" handler="off_on_battery_value_changed_cb" swapped="no"/>
                                             <style>
                                               <class name="xfce4-scale-label"/>
                                             </style>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="dpms-off-on-battery-label">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="sensitive">False</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0.5</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -1493,20 +1570,30 @@
                                             <property name="adjustment">dpms-off-on-ac-adjustment</property>
                                             <property name="round_digits">0</property>
                                             <property name="digits">0</property>
-                                            <property name="draw-value">False</property>
+                                            <property name="draw_value">False</property>
                                             <signal name="value-changed" handler="off_on_ac_value_changed_cb" swapped="no"/>
                                             <style>
                                               <class name="xfce4-scale-label"/>
                                             </style>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="dpms-off-on-ac-label">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="sensitive">False</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0.5</property>
                                           </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
                                       <packing>
@@ -1553,9 +1640,9 @@
                           <object class="GtkBox" id="vbox5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="margin_bottom">12</property>
                             <property name="margin_start">18</property>
+                            <property name="margin_bottom">12</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox" id="hbox1">
                                 <property name="visible">True</property>
@@ -1571,8 +1658,8 @@
                                       <object class="GtkLabel" id="brightness-level-label">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
                                         <property name="label" translatable="yes">On inactivity reduce to</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -1584,8 +1671,8 @@
                                       <object class="GtkLabel" id="brightness-inactivity-label">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Reduce after</property>
+                                        <property name="xalign">0</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -1610,9 +1697,9 @@
                                       <object class="GtkBox" id="hbox5">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="valign">center</property>
                                         <property name="spacing">6</property>
                                         <property name="homogeneous">True</property>
-                                        <property name="valign">center</property>
                                         <child>
                                           <object class="GtkBox" id="vbox18">
                                             <property name="visible">True</property>
@@ -1622,9 +1709,9 @@
                                               <object class="GtkLabel" id="brightness-on-battery-header">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="yalign">1</property>
                                                 <property name="label" translatable="yes">On battery</property>
                                                 <property name="use_markup">True</property>
+                                                <property name="yalign">1</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">True</property>
@@ -1644,20 +1731,30 @@
                                                     <property name="adjustment">brightness-level-on-battery-adjustment</property>
                                                     <property name="round_digits">0</property>
                                                     <property name="digits">0</property>
-                                                    <property name="draw-value">False</property>
+                                                    <property name="draw_value">False</property>
                                                     <signal name="value-changed" handler="brightness_level_on_battery" swapped="no"/>
                                                     <style>
                                                       <class name="xfce4-scale-label"/>
                                                     </style>
                                                   </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" id="brightness-level-on-battery-label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="sensitive">False</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0.5</property>
                                                   </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
                                                 </child>
                                               </object>
                                               <packing>
@@ -1682,9 +1779,9 @@
                                               <object class="GtkLabel" id="brightness-plugged-in-header">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
-                                                <property name="yalign">1</property>
                                                 <property name="label" translatable="yes">Plugged in</property>
                                                 <property name="use_markup">True</property>
+                                                <property name="yalign">1</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">True</property>
@@ -1704,20 +1801,30 @@
                                                     <property name="adjustment">brightness-level-on-ac-adjustment</property>
                                                     <property name="round_digits">0</property>
                                                     <property name="digits">0</property>
-                                                    <property name="draw-value">False</property>
+                                                    <property name="draw_value">False</property>
                                                     <signal name="value-changed" handler="brightness_level_on_ac" swapped="no"/>
                                                     <style>
                                                       <class name="xfce4-scale-label"/>
                                                     </style>
                                                   </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" id="brightness-level-on-ac-label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="sensitive">False</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0.5</property>
                                                   </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
                                                 </child>
                                               </object>
                                               <packing>
@@ -1744,35 +1851,45 @@
                                       <object class="GtkBox" id="hbox6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="valign">center</property>
                                         <property name="spacing">6</property>
                                         <property name="homogeneous">True</property>
-                                        <property name="valign">center</property>
                                         <child>
                                           <object class="GtkBox">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="orientation">vertical</property>
                                             <child>
-                                                <object class="GtkScale" id="brightness-inactivity-on-battery">
+                                              <object class="GtkScale" id="brightness-inactivity-on-battery">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="adjustment">brightness-inactivity-on-battery-adjustment</property>
                                                 <property name="round_digits">0</property>
                                                 <property name="digits">0</property>
-                                                <property name="draw-value">False</property>
+                                                <property name="draw_value">False</property>
                                                 <signal name="value-changed" handler="brightness_on_battery_value_changed_cb" swapped="no"/>
                                                 <style>
                                                   <class name="xfce4-scale-label"/>
                                                 </style>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="brightness-inactivity-on-battery-label">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="sensitive">False</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0.5</property>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
@@ -1793,20 +1910,30 @@
                                                 <property name="adjustment">brightness-inactivity-on-ac-adjustment</property>
                                                 <property name="round_digits">0</property>
                                                 <property name="digits">0</property>
-                                                <property name="draw-value">False</property>
+                                                <property name="draw_value">False</property>
                                                 <signal name="value-changed" handler="brightness_on_ac_value_changed_cb" swapped="no"/>
                                                 <style>
                                                   <class name="xfce4-scale-label"/>
                                                 </style>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="brightness-inactivity-on-ac-label">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="sensitive">False</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0.5</property>
                                               </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                              </packing>
                                             </child>
                                           </object>
                                           <packing>
@@ -1886,10 +2013,10 @@
                           <object class="GtkBox" id="light-locker-vbox2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
+                            <property name="margin_start">18</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">18</property>
-                            <property name="margin_start">18</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkGrid" id="light-locker-table">
@@ -1901,8 +2028,8 @@
                                   <object class="GtkLabel" id="light-locker-automatic-locking-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Automatically lock the session:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -1932,8 +2059,8 @@
                                   <object class="GtkLabel" id="light-locker-late-locking-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Delay locking after screensaver for</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -1946,26 +2073,36 @@
                                     <property name="can_focus">False</property>
                                     <property name="orientation">vertical</property>
                                     <child>
-                                        <object class="GtkScale" id="light-locker-late-locking-scale">
+                                      <object class="GtkScale" id="light-locker-late-locking-scale">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="adjustment">light-locker-late-locking-adjustment</property>
                                         <property name="round_digits">0</property>
                                         <property name="digits">0</property>
-                                        <property name="draw-value">False</property>
+                                        <property name="draw_value">False</property>
                                         <signal name="value-changed" handler="light_locker_late_locking_value_changed_cb" swapped="no"/>
                                         <style>
                                           <class name="xfce4-scale-label"/>
                                         </style>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="light-locker-late-locking-scale-label">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="sensitive">False</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0.5</property>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
diff -Nru xfce4-power-manager-1.6.5/data/interfaces/xfpm-settings_ui.h xfce4-power-manager-1.6.6/data/interfaces/xfpm-settings_ui.h
--- xfce4-power-manager-1.6.5/data/interfaces/xfpm-settings_ui.h	2019-08-11 22:44:04.000000000 +0000
+++ xfce4-power-manager-1.6.6/data/interfaces/xfpm-settings_ui.h	2020-03-08 21:31:19.000000000 +0000
@@ -56,874 +56,928 @@
   "alse</property><property name=\"icon_name\">help-browser</property></ob"
   "ject><object class=\"GtkImage\" id=\"image2\"><property name=\"visible\""
   ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"icon_name\">window-close</property></object><object class=\"GtkA"
-  "djustment\" id=\"light-locker-late-locking-adjustment\"><property name="
-  "\"lower\">1</property><property name=\"upper\">120</property><property "
-  "name=\"value\">1</property><property name=\"step_increment\">1</propert"
-  "y><property name=\"page_increment\">10</property></object><object class"
-  "=\"GtkListStore\" id=\"liststore1\"><columns><column type=\"gint\"/><co"
-  "lumn type=\"gchararray\"/></columns><data><row><col id=\"0\">0</col><co"
-  "l id=\"1\" translatable=\"yes\">Never</col></row><row><col id=\"0\">1</"
-  "col><col id=\"1\" translatable=\"yes\">When the screensaver is activate"
-  "d</col></row><row><col id=\"0\">2</col><col id=\"1\" translatable=\"yes"
-  "\">When the screensaver is deactivated</col></row></data></object><obje"
-  "ct class=\"GtkListStore\" id=\"model1\"><columns><column type=\"gcharar"
-  "ray\"/></columns><data><row><col id=\"0\" translatable=\"yes\">Nothing<"
-  "/col></row></data></object><object class=\"GtkListStore\" id=\"model10\""
-  "><columns><column type=\"gchararray\"/></columns><data><row><col id=\"0"
-  "\" translatable=\"yes\">Nothing</col></row></data></object><object clas"
-  "s=\"GtkListStore\" id=\"model11\"><columns><column type=\"gchararray\"/"
-  "></columns><data><row><col id=\"0\" translatable=\"yes\">Nothing</col><"
-  "/row></data></object><object class=\"GtkListStore\" id=\"model3\"><colu"
-  "mns><column type=\"gchararray\"/></columns><data><row><col id=\"0\" tra"
-  "nslatable=\"yes\">Nothing</col></row></data></object><object class=\"Gt"
-  "kListStore\" id=\"model4\"><columns><column type=\"gchararray\"/></colu"
-  "mns><data><row><col id=\"0\" translatable=\"yes\">Nothing</col></row></"
-  "data></object><object class=\"GtkListStore\" id=\"model5\"><columns><co"
-  "lumn type=\"gchararray\"/></columns><data><row><col id=\"0\" translatab"
-  "le=\"yes\">Nothing</col></row></data></object><object class=\"GtkListSt"
-  "ore\" id=\"model6\"><columns><column type=\"gchararray\"/></columns><da"
-  "ta><row><col id=\"0\" translatable=\"yes\">Nothing</col></row></data></"
-  "object><object class=\"GtkListStore\" id=\"model7\"><columns><column ty"
-  "pe=\"gchararray\"/></columns><data><row><col id=\"0\" translatable=\"ye"
-  "s\">Nothing</col></row></data></object><object class=\"GtkListStore\" i"
-  "d=\"model8\"><columns><column type=\"gchararray\"/></columns><data><row"
-  "><col id=\"0\" translatable=\"yes\">Nothing</col></row></data></object>"
-  "<object class=\"GtkListStore\" id=\"model9\"><columns><column type=\"gc"
-  "hararray\"/></columns><data><row><col id=\"0\" translatable=\"yes\">Not"
-  "hing</col></row></data></object><object class=\"GtkAdjustment\" id=\"sy"
-  "stem-sleep-inactivity-on-ac-adjustment\"><property name=\"lower\">14</p"
-  "roperty><property name=\"upper\">360</property><property name=\"value\""
-  ">14</property><property name=\"step_increment\">1</property><property n"
-  "ame=\"page_increment\">10</property><property name=\"page_size\">10</pr"
-  "operty></object><object class=\"GtkAdjustment\" id=\"system-sleep-inact"
-  "ivity-on-battery-adjustment\"><property name=\"lower\">14</property><pr"
-  "operty name=\"upper\">360</property><property name=\"value\">15</proper"
-  "ty><property name=\"step_increment\">1</property><property name=\"page_"
-  "increment\">10</property><property name=\"page_size\">10</property></ob"
-  "ject><object class=\"XfceTitledDialog\" id=\"xfpm-settings-dialog\"><pr"
-  "operty name=\"can_focus\">False</property><property name=\"title\" tran"
-  "slatable=\"yes\">Xfce Power Manager</property><property name=\"window_p"
-  "osition\">center-on-parent</property><property name=\"icon_name\">xfce4"
-  "-power-manager-settings</property><property name=\"type_hint\">dialog</"
-  "property><property name=\"subtitle\" translatable=\"yes\">Power manager"
-  " settings</property><child internal-child=\"vbox\"><object class=\"GtkB"
-  "ox\" id=\"dialog-vbox\"><property name=\"visible\">True</property><prop"
-  "erty name=\"can_focus\">False</property><property name=\"orientation\">"
-  "vertical</property><child internal-child=\"action_area\"><object class="
-  "\"GtkButtonBox\" id=\"dialog-action_area\"><property name=\"visible\">T"
-  "rue</property><property name=\"can_focus\">False</property><child><obje"
-  "ct class=\"GtkButton\" id=\"help-button\"><property name=\"label\" tran"
-  "slatable=\"yes\">_Help</property><property name=\"visible\">True</prope"
-  "rty><property name=\"can_focus\">True</property><property name=\"receiv"
-  "es_default\">True</property><property name=\"image\">image1</property><"
-  "property name=\"use_underline\">True</property></object><packing><prope"
-  "rty name=\"expand\">False</property><property name=\"fill\">False</prop"
-  "erty><property name=\"position\">0</property></packing></child><child><"
-  "object class=\"GtkButton\" id=\"close-button\"><property name=\"label\""
-  " translatable=\"yes\">_Close</property><property name=\"visible\">True<"
-  "/property><property name=\"can_focus\">True</property><property name=\""
-  "receives_default\">True</property><property name=\"image\">image2</prop"
-  "erty><property name=\"use_underline\">True</property></object><packing>"
-  "<property name=\"expand\">False</property><property name=\"fill\">False"
-  "</property><property name=\"position\">1</property></packing></child></"
-  "object><packing><property name=\"expand\">False</property><property nam"
-  "e=\"fill\">True</property><property name=\"position\">0</property></pac"
-  "king></child><child><object class=\"GtkBox\" id=\"plug-child\"><propert"
-  "y name=\"visible\">True</property><property name=\"can_focus\">False</p"
-  "roperty><property name=\"orientation\">vertical</property><property nam"
-  "e=\"border_width\">6</property><child><object class=\"GtkNotebook\" id="
-  "\"main-notebook\"><property name=\"visible\">True</property><property n"
-  "ame=\"can_focus\">True</property><child><object class=\"GtkBox\" id=\"v"
-  "box1\"><property name=\"visible\">True</property><property name=\"can_f"
-  "ocus\">False</property><property name=\"border_width\">12</property><pr"
-  "operty name=\"orientation\">vertical</property><property name=\"spacing"
-  "\">6</property><child><object class=\"GtkFrame\" id=\"buttons-frame\"><"
-  "property name=\"visible\">True</property><property name=\"can_focus\">F"
-  "alse</property><property name=\"label_xalign\">0</property><property na"
-  "me=\"shadow_type\">none</property><child><object class=\"GtkBox\" id=\""
-  "vbox2\"><property name=\"visible\">True</property><property name=\"can_"
-  "focus\">False</property><property name=\"margin_top\">6</property><prop"
-  "erty name=\"margin_bottom\">18</property><property name=\"margin_start\""
-  ">18</property><property name=\"orientation\">vertical</property><proper"
-  "ty name=\"spacing\">5</property><child><object class=\"GtkGrid\" id=\"t"
-  "able1\"><property name=\"visible\">True</property><property name=\"can_"
-  "focus\">False</property><property name=\"row_spacing\">6</property><pro"
-  "perty name=\"column_spacing\">6</property><child><object class=\"GtkLab"
-  "el\" id=\"button-power-label\"><property name=\"visible\">True</propert"
-  "y><property name=\"can_focus\">False</property><property name=\"xalign\""
-  ">0</property><property name=\"label\" translatable=\"yes\">When power b"
-  "utton is pressed:</property></object><packing><property name=\"left_att"
-  "ach\">0</property><property name=\"top_attach\">0</property></packing><"
-  "/child><child><object class=\"GtkLabel\" id=\"button-sleep-label\"><pro"
-  "perty name=\"visible\">True</property><property name=\"can_focus\">Fals"
-  "e</property><property name=\"xalign\">0</property><property name=\"labe"
-  "l\" translatable=\"yes\">When sleep button is pressed:</property></obje"
-  "ct><packing><property name=\"left_attach\">0</property><property name=\""
-  "top_attach\">1</property></packing></child><child><object class=\"GtkLa"
-  "bel\" id=\"button-hibernate-label\"><property name=\"visible\">True</pr"
-  "operty><property name=\"can_focus\">False</property><property name=\"xa"
-  "lign\">0</property><property name=\"label\" translatable=\"yes\">When h"
-  "ibernate button is pressed:</property></object><packing><property name="
-  "\"left_attach\">0</property><property name=\"top_attach\">2</property><"
-  "/packing></child><child><object class=\"GtkLabel\" id=\"button-battery-"
-  "label\"><property name=\"visible\">True</property><property name=\"can_"
-  "focus\">False</property><property name=\"xalign\">0</property><property"
-  " name=\"label\" translatable=\"yes\">When battery button is pressed:</p"
-  "roperty></object><packing><property name=\"left_attach\">0</property><p"
-  "roperty name=\"top_attach\">3</property></packing></child><child><objec"
-  "t class=\"GtkComboBox\" id=\"button-power-combo\"><property name=\"visi"
-  "ble\">True</property><property name=\"can_focus\">False</property><prop"
-  "erty name=\"hexpand\">True</property><signal name=\"changed\" handler=\""
-  "button_power_changed_cb\" swapped=\"no\"/><child><object class=\"GtkCel"
-  "lRendererText\" id=\"renderer1\"/><attributes><attribute name=\"text\">"
-  "0</attribute></attributes></child></object><packing><property name=\"le"
-  "ft_attach\">1</property><property name=\"top_attach\">0</property></pac"
-  "king></child><child><object class=\"GtkComboBox\" id=\"button-sleep-com"
-  "bo\"><property name=\"visible\">True</property><property name=\"can_foc"
-  "us\">False</property><property name=\"hexpand\">True</property><signal "
-  "name=\"changed\" handler=\"button_sleep_changed_cb\" swapped=\"no\"/><c"
-  "hild><object class=\"GtkCellRendererText\" id=\"renderer4\"/><attribute"
-  "s><attribute name=\"text\">0</attribute></attributes></child></object><"
-  "packing><property name=\"left_attach\">1</property><property name=\"top"
-  "_attach\">1</property></packing></child><child><object class=\"GtkCombo"
-  "Box\" id=\"button-hibernate-combo\"><property name=\"visible\">True</pr"
-  "operty><property name=\"can_focus\">False</property><property name=\"he"
-  "xpand\">True</property><signal name=\"changed\" handler=\"button_hibern"
-  "ate_changed_cb\" swapped=\"no\"/><child><object class=\"GtkCellRenderer"
-  "Text\" id=\"renderer3\"/><attributes><attribute name=\"text\">0</attrib"
-  "ute></attributes></child></object><packing><property name=\"left_attach"
-  "\">1</property><property name=\"top_attach\">2</property></packing></ch"
-  "ild><child><object class=\"GtkComboBox\" id=\"button-battery-combo\"><p"
-  "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa"
-  "lse</property><property name=\"hexpand\">True</property><signal name=\""
-  "changed\" handler=\"button_battery_changed_cb\" swapped=\"no\"/><child>"
-  "<object class=\"GtkCellRendererText\" id=\"renderer5\"/><attributes><at"
-  "tribute name=\"text\">0</attribute></attributes></child></object><packi"
-  "ng><property name=\"left_attach\">1</property><property name=\"top_atta"
-  "ch\">3</property></packing></child><child><object class=\"GtkSwitch\" i"
-  "d=\"handle-brightness-keys\"><property name=\"visible\">True</property>"
-  "<property name=\"can_focus\">True</property><property name=\"halign\">e"
-  "nd</property></object><packing><property name=\"left_attach\">1</proper"
-  "ty><property name=\"top_attach\">4</property></packing></child><child><"
-  "object class=\"GtkLabel\" id=\"handle-brightness-keys-label\"><property"
-  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
-  "operty><property name=\"xalign\">0</property><property name=\"label\" t"
-  "ranslatable=\"yes\">Handle display brightness _keys</property><property"
-  " name=\"use_underline\">True</property><property name=\"ellipsize\">end"
-  "</property></object><packing><property name=\"left_attach\">0</property"
-  "><property name=\"top_attach\">4</property></packing></child></object><"
-  "packing><property name=\"expand\">True</property><property name=\"fill\""
-  ">True</property><property name=\"position\">0</property></packing></chi"
-  "ld></object></child><child type=\"label\"><object class=\"GtkLabel\" id"
-  "=\"label1\"><property name=\"visible\">True</property><property name=\""
-  "can_focus\">False</property><property name=\"label\" translatable=\"yes"
-  "\">&lt;b&gt;Buttons&lt;/b&gt;</property><property name=\"use_markup\">T"
-  "rue</property></object></child></object><packing><property name=\"expan"
-  "d\">False</property><property name=\"fill\">True</property><property na"
-  "me=\"position\">0</property></packing></child><child><object class=\"Gt"
-  "kFrame\" id=\"laptop-lid-frame\"><property name=\"visible\">True</prope"
-  "rty><property name=\"can_focus\">False</property><property name=\"label"
-  "_xalign\">0</property><property name=\"shadow_type\">none</property><ch"
-  "ild><object class=\"GtkGrid\" id=\"table5\"><property name=\"visible\">"
-  "True</property><property name=\"can_focus\">False</property><property n"
-  "ame=\"row_spacing\">6</property><property name=\"margin_top\">3</proper"
-  "ty><property name=\"margin_bottom\">18</property><property name=\"margi"
-  "n_start\">18</property><property name=\"column_spacing\">18</property><"
-  "child><object class=\"GtkLabel\" id=\"lid-on-battery-header\"><property"
-  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
-  "operty><property name=\"label\" translatable=\"yes\">On battery</proper"
-  "ty><property name=\"use_markup\">True</property></object><packing><prop"
-  "erty name=\"left_attach\">1</property><property name=\"top_attach\">0</"
-  "property></packing></child><child><object class=\"GtkLabel\" id=\"lid-p"
-  "lugged-in-header\"><property name=\"visible\">True</property><property "
-  "name=\"can_focus\">False</property><property name=\"label\" translatabl"
-  "e=\"yes\">Plugged in</property><property name=\"use_markup\">True</prop"
-  "erty></object><packing><property name=\"left_attach\">2</property><prop"
-  "erty name=\"top_attach\">0</property></packing></child><child><object c"
-  "lass=\"GtkLabel\" id=\"lid-action-label\"><property name=\"visible\">Tr"
-  "ue</property><property name=\"can_focus\">False</property><property nam"
-  "e=\"xalign\">0</property><property name=\"label\" translatable=\"yes\">"
-  "When laptop lid is closed:</property></object><packing><property name=\""
-  "left_attach\">0</property><property name=\"top_attach\">1</property></p"
-  "acking></child><child><object class=\"GtkComboBox\" id=\"lid-on-battery"
-  "-combo\"><property name=\"visible\">True</property><property name=\"can"
-  "_focus\">False</property><property name=\"hexpand\">True</property><sig"
-  "nal name=\"changed\" handler=\"on_battery_lid_changed_cb\" swapped=\"no"
-  "\"/><child><object class=\"GtkCellRendererText\" id=\"renderer9\"/><att"
-  "ributes><attribute name=\"text\">0</attribute></attributes></child></ob"
-  "ject><packing><property name=\"left_attach\">1</property><property name"
-  "=\"top_attach\">1</property></packing></child><child><object class=\"Gt"
-  "kComboBox\" id=\"lid-on-ac-combo\"><property name=\"visible\">True</pro"
-  "perty><property name=\"can_focus\">False</property><property name=\"hex"
-  "pand\">True</property><signal name=\"changed\" handler=\"on_ac_lid_chan"
-  "ged_cb\" swapped=\"no\"/><child><object class=\"GtkCellRendererText\" i"
-  "d=\"renderer10\"/><attributes><attribute name=\"text\">0</attribute></a"
-  "ttributes></child></object><packing><property name=\"left_attach\">2</p"
-  "roperty><property name=\"top_attach\">1</property></packing></child><ch"
-  "ild><placeholder/></child></object></child><child type=\"label\"><objec"
-  "t class=\"GtkLabel\" id=\"label3\"><property name=\"visible\">True</pro"
-  "perty><property name=\"can_focus\">False</property><property name=\"lab"
-  "el\" translatable=\"yes\">&lt;b&gt;Laptop Lid&lt;/b&gt;</property><prop"
-  "erty name=\"use_markup\">True</property></object></child></object><pack"
-  "ing><property name=\"expand\">False</property><property name=\"fill\">T"
-  "rue</property><property name=\"position\">1</property></packing></child"
-  "><child><object class=\"GtkFrame\" id=\"appearance-frame\"><property na"
-  "me=\"visible\">True</property><property name=\"can_focus\">False</prope"
-  "rty><property name=\"label_xalign\">0</property><property name=\"shadow"
-  "_type\">none</property><child><object class=\"GtkBox\" id=\"vbox10\"><p"
-  "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa"
-  "lse</property><property name=\"orientation\">vertical</property><proper"
-  "ty name=\"margin_top\">6</property><property name=\"margin_bottom\">18<"
-  "/property><property name=\"margin_start\">18</property><property name=\""
-  "spacing\">6</property><child><object class=\"GtkBox\" id=\"hbox20\"><pr"
-  "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
-  "se</property><child><object class=\"GtkSwitch\" id=\"show-notifications"
-  "\"><property name=\"visible\">True</property><property name=\"can_focus"
-  "\">True</property><property name=\"halign\">end</property></object><pac"
+  "name=\"icon_name\">window-close-symbolic</property></object><object cla"
+  "ss=\"GtkAdjustment\" id=\"light-locker-late-locking-adjustment\"><prope"
+  "rty name=\"lower\">1</property><property name=\"upper\">120</property><"
+  "property name=\"value\">1</property><property name=\"step_increment\">1"
+  "</property><property name=\"page_increment\">10</property></object><obj"
+  "ect class=\"GtkListStore\" id=\"liststore1\"><columns><column type=\"gi"
+  "nt\"/><column type=\"gchararray\"/></columns><data><row><col id=\"0\">0"
+  "</col><col id=\"1\" translatable=\"yes\">Never</col></row><row><col id="
+  "\"0\">1</col><col id=\"1\" translatable=\"yes\">When the screensaver is"
+  " activated</col></row><row><col id=\"0\">2</col><col id=\"1\" translata"
+  "ble=\"yes\">When the screensaver is deactivated</col></row></data></obj"
+  "ect><object class=\"GtkListStore\" id=\"model1\"><columns><column type="
+  "\"gchararray\"/></columns><data><row><col id=\"0\" translatable=\"yes\""
+  ">Nothing</col></row></data></object><object class=\"GtkListStore\" id=\""
+  "model10\"><columns><column type=\"gchararray\"/></columns><data><row><c"
+  "ol id=\"0\" translatable=\"yes\">Nothing</col></row></data></object><ob"
+  "ject class=\"GtkListStore\" id=\"model11\"><columns><column type=\"gcha"
+  "rarray\"/></columns><data><row><col id=\"0\" translatable=\"yes\">Nothi"
+  "ng</col></row></data></object><object class=\"GtkListStore\" id=\"model"
+  "3\"><columns><column type=\"gchararray\"/></columns><data><row><col id="
+  "\"0\" translatable=\"yes\">Nothing</col></row></data></object><object c"
+  "lass=\"GtkListStore\" id=\"model4\"><columns><column type=\"gchararray\""
+  "/></columns><data><row><col id=\"0\" translatable=\"yes\">Nothing</col>"
+  "</row></data></object><object class=\"GtkListStore\" id=\"model5\"><col"
+  "umns><column type=\"gchararray\"/></columns><data><row><col id=\"0\" tr"
+  "anslatable=\"yes\">Nothing</col></row></data></object><object class=\"G"
+  "tkListStore\" id=\"model6\"><columns><column type=\"gchararray\"/></col"
+  "umns><data><row><col id=\"0\" translatable=\"yes\">Nothing</col></row><"
+  "/data></object><object class=\"GtkListStore\" id=\"model7\"><columns><c"
+  "olumn type=\"gchararray\"/></columns><data><row><col id=\"0\" translata"
+  "ble=\"yes\">Nothing</col></row></data></object><object class=\"GtkListS"
+  "tore\" id=\"model8\"><columns><column type=\"gchararray\"/></columns><d"
+  "ata><row><col id=\"0\" translatable=\"yes\">Nothing</col></row></data><"
+  "/object><object class=\"GtkListStore\" id=\"model9\"><columns><column t"
+  "ype=\"gchararray\"/></columns><data><row><col id=\"0\" translatable=\"y"
+  "es\">Nothing</col></row></data></object><object class=\"GtkAdjustment\""
+  " id=\"system-sleep-inactivity-on-ac-adjustment\"><property name=\"lower"
+  "\">14</property><property name=\"upper\">360</property><property name=\""
+  "value\">14</property><property name=\"step_increment\">1</property><pro"
+  "perty name=\"page_increment\">10</property><property name=\"page_size\""
+  ">10</property></object><object class=\"GtkAdjustment\" id=\"system-slee"
+  "p-inactivity-on-battery-adjustment\"><property name=\"lower\">14</prope"
+  "rty><property name=\"upper\">360</property><property name=\"value\">15<"
+  "/property><property name=\"step_increment\">1</property><property name="
+  "\"page_increment\">10</property><property name=\"page_size\">10</proper"
+  "ty></object><object class=\"XfceTitledDialog\" id=\"xfpm-settings-dialo"
+  "g\"><property name=\"can_focus\">False</property><property name=\"title"
+  "\" translatable=\"yes\">Xfce Power Manager</property><property name=\"w"
+  "indow_position\">center-on-parent</property><property name=\"icon_name\""
+  ">xfce4-power-manager-settings</property><property name=\"type_hint\">di"
+  "alog</property><property name=\"subtitle\" translatable=\"yes\">Power m"
+  "anager settings</property><child internal-child=\"vbox\"><object class="
+  "\"GtkBox\" id=\"dialog-vbox\"><property name=\"visible\">True</property"
+  "><property name=\"can_focus\">False</property><property name=\"orientat"
+  "ion\">vertical</property><child internal-child=\"action_area\"><object "
+  "class=\"GtkButtonBox\" id=\"dialog-action_area\"><property name=\"visib"
+  "le\">True</property><property name=\"can_focus\">False</property><child"
+  "><object class=\"GtkButton\" id=\"help-button\"><property name=\"label\""
+  " translatable=\"yes\">_Help</property><property name=\"visible\">True</"
+  "property><property name=\"can_focus\">True</property><property name=\"r"
+  "eceives_default\">True</property><property name=\"image\">image1</prope"
+  "rty><property name=\"use_underline\">True</property></object><packing><"
+  "property name=\"expand\">False</property><property name=\"fill\">False<"
+  "/property><property name=\"position\">0</property></packing></child><ch"
+  "ild><object class=\"GtkButton\" id=\"close-button\"><property name=\"la"
+  "bel\" translatable=\"yes\">_Close</property><property name=\"visible\">"
+  "True</property><property name=\"can_focus\">True</property><property na"
+  "me=\"receives_default\">True</property><property name=\"image\">image2<"
+  "/property><property name=\"use_underline\">True</property></object><pac"
   "king><property name=\"expand\">False</property><property name=\"fill\">"
-  "True</property><property name=\"position\">1</property></packing></chil"
-  "d><child><object class=\"GtkLabel\" id=\"show-notifications-label\"><pr"
+  "False</property><property name=\"position\">1</property></packing></chi"
+  "ld></object><packing><property name=\"expand\">False</property><propert"
+  "y name=\"fill\">True</property><property name=\"position\">0</property>"
+  "</packing></child><child><object class=\"GtkBox\" id=\"plug-child\"><pr"
   "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
-  "se</property><property name=\"xalign\">0</property><property name=\"lab"
-  "el\" translatable=\"yes\">Status notifications</property><property name"
-  "=\"use_underline\">True</property><property name=\"ellipsize\">end</pro"
-  "perty></object><packing><property name=\"expand\">True</property><prope"
-  "rty name=\"fill\">True</property><property name=\"position\">0</propert"
-  "y></packing></child></object><packing><property name=\"expand\">True</p"
-  "roperty><property name=\"fill\">True</property><property name=\"positio"
-  "n\">1</property></packing></child><child><object class=\"GtkBox\" id=\""
-  "hbox21\"><property name=\"visible\">True</property><property name=\"can"
-  "_focus\">False</property><child><object class=\"GtkSwitch\" id=\"show-s"
-  "ystray\"><property name=\"visible\">True</property><property name=\"can"
-  "_focus\">True</property><property name=\"halign\">end</property></objec"
-  "t><packing><property name=\"expand\">False</property><property name=\"f"
-  "ill\">True</property><property name=\"position\">1</property></packing>"
-  "</child><child><object class=\"GtkLabel\" id=\"show-systray-label\"><pr"
-  "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
-  "se</property><property name=\"xalign\">0</property><property name=\"lab"
-  "el\" translatable=\"yes\">System tray icon</property><property name=\"u"
-  "se_underline\">True</property><property name=\"ellipsize\">end</propert"
-  "y></object><packing><property name=\"expand\">True</property><property "
-  "name=\"fill\">True</property><property name=\"position\">0</property></"
-  "packing></child></object><packing><property name=\"expand\">True</prope"
-  "rty><property name=\"fill\">True</property><property name=\"position\">"
-  "2</property></packing></child></object></child><child type=\"label\"><o"
-  "bject class=\"GtkLabel\" id=\"label2\"><property name=\"visible\">True<"
-  "/property><property name=\"can_focus\">False</property><property name=\""
-  "label\" translatable=\"yes\">&lt;b&gt;Appearance&lt;/b&gt;</property><p"
-  "roperty name=\"use_markup\">True</property></object></child></object><p"
-  "acking><property name=\"expand\">False</property><property name=\"fill\""
-  ">True</property><property name=\"position\">2</property></packing></chi"
-  "ld></object><packing><property name=\"position\">1</property></packing>"
-  "</child><child type=\"tab\"><object class=\"GtkLabel\" id=\"general\"><"
-  "property name=\"visible\">True</property><property name=\"can_focus\">F"
-  "alse</property><property name=\"label\" translatable=\"yes\">General</p"
-  "roperty></object><packing><property name=\"position\">1</property><prop"
-  "erty name=\"tab_fill\">False</property></packing></child><child><object"
-  " class=\"GtkBox\" id=\"vbox3\"><property name=\"visible\">True</propert"
-  "y><property name=\"can_focus\">False</property><property name=\"border_"
-  "width\">12</property><property name=\"orientation\">vertical</property>"
-  "<property name=\"spacing\">6</property><child><object class=\"GtkFrame\""
-  " id=\"system-sleep-frame\"><property name=\"visible\">True</property><p"
-  "roperty name=\"can_focus\">False</property><property name=\"label_xalig"
-  "n\">0</property><property name=\"shadow_type\">none</property><child><o"
-  "bject class=\"GtkGrid\" id=\"table2\"><property name=\"visible\">True</"
-  "property><property name=\"can_focus\">False</property><property name=\""
-  "row_spacing\">6</property><property name=\"column_spacing\">18</propert"
-  "y><property name=\"margin_top\">6</property><property name=\"margin_bot"
-  "tom\">6</property><property name=\"margin_start\">18</property><propert"
-  "y name=\"column-homogeneous\">True</property><child><object class=\"Gtk"
-  "Label\" id=\"system-sleep-on-battery-header\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"label\" translatable=\"yes\">On battery</property><property name"
-  "=\"use_markup\">True</property></object><packing><property name=\"left_"
-  "attach\">1</property><property name=\"top_attach\">0</property></packin"
-  "g></child><child><object class=\"GtkLabel\" id=\"system-sleep-plugged-i"
-  "n-header\"><property name=\"visible\">True</property><property name=\"c"
-  "an_focus\">False</property><property name=\"label\" translatable=\"yes\""
-  ">Plugged in</property><property name=\"use_markup\">True</property></ob"
-  "ject><packing><property name=\"left_attach\">2</property><property name"
-  "=\"top_attach\">0</property></packing></child><child><object class=\"Gt"
-  "kLabel\" id=\"system-sleep-inactivity-label\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"xalign\">0</property><property name=\"label\" translatable=\"yes"
-  "\">When inactive for</property></object><packing><property name=\"left_"
-  "attach\">0</property><property name=\"top_attach\">2</property></packin"
-  "g></child><child><object class=\"GtkBox\"><property name=\"visible\">Tr"
-  "ue</property><property name=\"can_focus\">False</property><property nam"
-  "e=\"orientation\">vertical</property><child><object class=\"GtkScale\" "
-  "id=\"system-sleep-inactivity-on-battery\"><property name=\"visible\">Tr"
-  "ue</property><property name=\"can_focus\">True</property><property name"
-  "=\"adjustment\">system-sleep-inactivity-on-battery-adjustment</property"
-  "><property name=\"round_digits\">0</property><property name=\"digits\">"
-  "0</property><property name=\"draw-value\">False</property><signal name="
-  "\"value-changed\" handler=\"inactivity_on_battery_value_changed_cb\" sw"
-  "apped=\"no\"/><style><class name=\"xfce4-scale-label\"/></style></objec"
-  "t></child><child><object class=\"GtkLabel\" id=\"system-sleep-inactivit"
-  "y-on-battery-label\"><property name=\"visible\">True</property><propert"
-  "y name=\"can_focus\">False</property><property name=\"sensitive\">False"
-  "</property><property name=\"xalign\">0.5</property></object></child></o"
-  "bject><packing><property name=\"left_attach\">1</property><property nam"
-  "e=\"top_attach\">2</property></packing></child><child><object class=\"G"
-  "tkBox\"><property name=\"visible\">True</property><property name=\"can_"
-  "focus\">False</property><property name=\"orientation\">vertical</proper"
-  "ty><child><object class=\"GtkScale\" id=\"system-sleep-inactivity-on-ac"
+  "se</property><property name=\"border_width\">6</property><property name"
+  "=\"orientation\">vertical</property><child><object class=\"GtkNotebook\""
+  " id=\"main-notebook\"><property name=\"visible\">True</property><proper"
+  "ty name=\"can_focus\">True</property><child><object class=\"GtkBox\" id"
+  "=\"vbox1\"><property name=\"visible\">True</property><property name=\"c"
+  "an_focus\">False</property><property name=\"border_width\">12</property"
+  "><property name=\"orientation\">vertical</property><property name=\"spa"
+  "cing\">6</property><child><object class=\"GtkFrame\" id=\"buttons-frame"
   "\"><property name=\"visible\">True</property><property name=\"can_focus"
-  "\">True</property><property name=\"adjustment\">system-sleep-inactivity"
-  "-on-ac-adjustment</property><property name=\"round_digits\">0</property"
-  "><property name=\"digits\">0</property><property name=\"draw-value\">Fa"
-  "lse</property><signal name=\"value-changed\" handler=\"inactivity_on_ac"
-  "_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-la"
-  "bel\"/></style></object></child><child><object class=\"GtkLabel\" id=\""
-  "system-sleep-inactivity-on-ac-label\"><property name=\"visible\">True</"
-  "property><property name=\"can_focus\">False</property><property name=\""
-  "sensitive\">False</property><property name=\"xalign\">0.5</property></o"
-  "bject><packing><property name=\"expand\">True</property><property name="
-  "\"fill\">True</property></packing></child></object><packing><property n"
-  "ame=\"left_attach\">2</property><property name=\"top_attach\">2</proper"
-  "ty></packing></child><child><object class=\"GtkLabel\" id=\"system-slee"
-  "p-mode-label\"><property name=\"visible\">True</property><property name"
-  "=\"can_focus\">False</property><property name=\"xalign\">0</property><p"
-  "roperty name=\"label\" translatable=\"yes\">System sleep mode:</propert"
-  "y></object><packing><property name=\"left_attach\">0</property><propert"
-  "y name=\"top_attach\">1</property></packing></child><child><object clas"
-  "s=\"GtkComboBox\" id=\"system-sleep-mode-on-battery\"><property name=\""
+  "\">False</property><property name=\"label_xalign\">0</property><propert"
+  "y name=\"shadow_type\">none</property><child><object class=\"GtkBox\" i"
+  "d=\"vbox2\"><property name=\"visible\">True</property><property name=\""
+  "can_focus\">False</property><property name=\"margin_start\">18</propert"
+  "y><property name=\"margin_top\">6</property><property name=\"margin_bot"
+  "tom\">18</property><property name=\"orientation\">vertical</property><p"
+  "roperty name=\"spacing\">5</property><child><object class=\"GtkGrid\" i"
+  "d=\"table1\"><property name=\"visible\">True</property><property name=\""
+  "can_focus\">False</property><property name=\"row_spacing\">6</property>"
+  "<property name=\"column_spacing\">6</property><child><object class=\"Gt"
+  "kLabel\" id=\"button-power-label\"><property name=\"visible\">True</pro"
+  "perty><property name=\"can_focus\">False</property><property name=\"lab"
+  "el\" translatable=\"yes\">When power button is pressed:</property><prop"
+  "erty name=\"xalign\">0</property></object><packing><property name=\"lef"
+  "t_attach\">0</property><property name=\"top_attach\">0</property></pack"
+  "ing></child><child><object class=\"GtkLabel\" id=\"button-sleep-label\""
+  "><property name=\"visible\">True</property><property name=\"can_focus\""
+  ">False</property><property name=\"label\" translatable=\"yes\">When sle"
+  "ep button is pressed:</property><property name=\"xalign\">0</property><"
+  "/object><packing><property name=\"left_attach\">0</property><property n"
+  "ame=\"top_attach\">1</property></packing></child><child><object class=\""
+  "GtkLabel\" id=\"button-hibernate-label\"><property name=\"visible\">Tru"
+  "e</property><property name=\"can_focus\">False</property><property name"
+  "=\"label\" translatable=\"yes\">When hibernate button is pressed:</prop"
+  "erty><property name=\"xalign\">0</property></object><packing><property "
+  "name=\"left_attach\">0</property><property name=\"top_attach\">2</prope"
+  "rty></packing></child><child><object class=\"GtkLabel\" id=\"button-bat"
+  "tery-label\"><property name=\"visible\">True</property><property name=\""
+  "can_focus\">False</property><property name=\"label\" translatable=\"yes"
+  "\">When battery button is pressed:</property><property name=\"xalign\">"
+  "0</property></object><packing><property name=\"left_attach\">0</propert"
+  "y><property name=\"top_attach\">3</property></packing></child><child><o"
+  "bject class=\"GtkComboBox\" id=\"button-power-combo\"><property name=\""
   "visible\">True</property><property name=\"can_focus\">False</property><"
   "property name=\"hexpand\">True</property><signal name=\"changed\" handl"
-  "er=\"on_battery_sleep_mode_changed_cb\" swapped=\"no\"/><child><object "
-  "class=\"GtkCellRendererText\" id=\"renderer8\"/><attributes><attribute "
-  "name=\"text\">0</attribute></attributes></child></object><packing><prop"
-  "erty name=\"left_attach\">1</property><property name=\"top_attach\">1</"
-  "property></packing></child><child><object class=\"GtkComboBox\" id=\"sy"
-  "stem-sleep-mode-on-ac\"><property name=\"visible\">True</property><prop"
-  "erty name=\"can_focus\">False</property><property name=\"hexpand\">True"
-  "</property><signal name=\"changed\" handler=\"on_ac_sleep_mode_changed_"
-  "cb\" swapped=\"no\"/><child><object class=\"GtkCellRendererText\" id=\""
-  "renderer2\"/><attributes><attribute name=\"text\">0</attribute></attrib"
-  "utes></child></object><packing><property name=\"left_attach\">2</proper"
-  "ty><property name=\"top_attach\">1</property></packing></child><child><"
-  "placeholder/></child></object></child><child type=\"label\"><object cla"
-  "ss=\"GtkLabel\" id=\"label8\"><property name=\"visible\">True</property"
-  "><property name=\"can_focus\">False</property><property name=\"label\" "
-  "translatable=\"yes\">&lt;b&gt;System power saving&lt;/b&gt;</property><"
-  "property name=\"use_markup\">True</property></object></child></object><"
-  "packing><property name=\"expand\">False</property><property name=\"fill"
-  "\">True</property><property name=\"position\">0</property></packing></c"
-  "hild><child><object class=\"GtkFrame\" id=\"critical-power-frame\"><pro"
-  "perty name=\"visible\">True</property><property name=\"can_focus\">Fals"
-  "e</property><property name=\"label_xalign\">0</property><property name="
-  "\"shadow_type\">none</property><child><object class=\"GtkBox\" id=\"vbo"
-  "x4\"><property name=\"visible\">True</property><property name=\"can_foc"
-  "us\">False</property><property name=\"orientation\">vertical</property>"
-  "<property name=\"spacing\">3</property><property name=\"margin_top\">6<"
-  "/property><property name=\"margin_bottom\">12</property><property name="
-  "\"margin_start\">18</property><child><object class=\"GtkBox\" id=\"hbox"
-  "2\"><property name=\"visible\">True</property><property name=\"can_focu"
-  "s\">False</property><property name=\"spacing\">6</property><child><obje"
-  "ct class=\"GtkLabel\" id=\"critical-power-level-label\"><property name="
-  "\"visible\">True</property><property name=\"can_focus\">False</property"
-  "><property name=\"xalign\">0</property><property name=\"label\" transla"
-  "table=\"yes\">Critical battery power level:</property></object><packing"
-  "><property name=\"expand\">False</property><property name=\"fill\">True"
-  "</property><property name=\"position\">0</property></packing></child><c"
-  "hild><object class=\"GtkSpinButton\" id=\"critical-power-level-spin\"><"
-  "property name=\"visible\">True</property><property name=\"can_focus\">T"
-  "rue</property><property name=\"invisible_char\">\342\227\217</property>"
-  "<property name=\"primary_icon_activatable\">False</property><property n"
-  "ame=\"secondary_icon_activatable\">False</property><property name=\"adj"
-  "ustment\">critical-power-level-spin-adjustment</property><property name"
-  "=\"width-chars\">6</property><property name=\"width-request\">100</prop"
-  "erty><signal name=\"output\" handler=\"critical_spin_output_cb\" swappe"
-  "d=\"no\"/><signal name=\"value-changed\" handler=\"critical_level_value"
-  "_changed_cb\" swapped=\"no\"/></object><packing><property name=\"expand"
-  "\">False</property><property name=\"fill\">True</property><property nam"
-  "e=\"position\">1</property></packing></child></object><packing><propert"
-  "y name=\"expand\">False</property><property name=\"fill\">True</propert"
-  "y><property name=\"position\">0</property></packing></child><child><obj"
-  "ect class=\"GtkBox\" id=\"hbox3\"><property name=\"visible\">True</prop"
-  "erty><property name=\"can_focus\">False</property><property name=\"spac"
-  "ing\">6</property><child><object class=\"GtkLabel\" id=\"critical-power"
-  "-action-label\"><property name=\"visible\">True</property><property nam"
-  "e=\"can_focus\">False</property><property name=\"xalign\">0</property><"
-  "property name=\"label\" translatable=\"yes\">On critical battery power:"
-  "</property></object><packing><property name=\"expand\">False</property>"
-  "<property name=\"fill\">True</property><property name=\"position\">0</p"
-  "roperty></packing></child><child><object class=\"GtkComboBox\" id=\"cri"
-  "tical-power-action-combo\"><property name=\"visible\">True</property><p"
-  "roperty name=\"can_focus\">False</property><signal name=\"changed\" han"
-  "dler=\"battery_critical_changed_cb\" swapped=\"no\"/><child><object cla"
-  "ss=\"GtkCellRendererText\" id=\"renderer7\"/><attributes><attribute nam"
-  "e=\"text\">0</attribute></attributes></child></object><packing><propert"
-  "y name=\"expand\">True</property><property name=\"fill\">True</property"
-  "><property name=\"position\">1</property></packing></child></object><pa"
+  "er=\"button_power_changed_cb\" swapped=\"no\"/><child><object class=\"G"
+  "tkCellRendererText\" id=\"renderer1\"/><attributes><attribute name=\"te"
+  "xt\">0</attribute></attributes></child></object><packing><property name"
+  "=\"left_attach\">1</property><property name=\"top_attach\">0</property>"
+  "</packing></child><child><object class=\"GtkComboBox\" id=\"button-slee"
+  "p-combo\"><property name=\"visible\">True</property><property name=\"ca"
+  "n_focus\">False</property><property name=\"hexpand\">True</property><si"
+  "gnal name=\"changed\" handler=\"button_sleep_changed_cb\" swapped=\"no\""
+  "/><child><object class=\"GtkCellRendererText\" id=\"renderer4\"/><attri"
+  "butes><attribute name=\"text\">0</attribute></attributes></child></obje"
+  "ct><packing><property name=\"left_attach\">1</property><property name=\""
+  "top_attach\">1</property></packing></child><child><object class=\"GtkCo"
+  "mboBox\" id=\"button-hibernate-combo\"><property name=\"visible\">True<"
+  "/property><property name=\"can_focus\">False</property><property name=\""
+  "hexpand\">True</property><signal name=\"changed\" handler=\"button_hibe"
+  "rnate_changed_cb\" swapped=\"no\"/><child><object class=\"GtkCellRender"
+  "erText\" id=\"renderer3\"/><attributes><attribute name=\"text\">0</attr"
+  "ibute></attributes></child></object><packing><property name=\"left_atta"
+  "ch\">1</property><property name=\"top_attach\">2</property></packing></"
+  "child><child><object class=\"GtkComboBox\" id=\"button-battery-combo\">"
+  "<property name=\"visible\">True</property><property name=\"can_focus\">"
+  "False</property><property name=\"hexpand\">True</property><signal name="
+  "\"changed\" handler=\"button_battery_changed_cb\" swapped=\"no\"/><chil"
+  "d><object class=\"GtkCellRendererText\" id=\"renderer5\"/><attributes><"
+  "attribute name=\"text\">0</attribute></attributes></child></object><pac"
+  "king><property name=\"left_attach\">1</property><property name=\"top_at"
+  "tach\">3</property></packing></child><child><object class=\"GtkSwitch\""
+  " id=\"handle-brightness-keys\"><property name=\"visible\">True</propert"
+  "y><property name=\"can_focus\">True</property><property name=\"halign\""
+  ">end</property></object><packing><property name=\"left_attach\">1</prop"
+  "erty><property name=\"top_attach\">4</property></packing></child><child"
+  "><object class=\"GtkLabel\" id=\"handle-brightness-keys-label\"><proper"
+  "ty name=\"visible\">True</property><property name=\"can_focus\">False</"
+  "property><property name=\"label\" translatable=\"yes\">Handle display b"
+  "rightness _keys</property><property name=\"use_underline\">True</proper"
+  "ty><property name=\"ellipsize\">end</property><property name=\"xalign\""
+  ">0</property></object><packing><property name=\"left_attach\">0</proper"
+  "ty><property name=\"top_attach\">4</property></packing></child></object"
+  "><packing><property name=\"expand\">True</property><property name=\"fil"
+  "l\">True</property><property name=\"position\">0</property></packing></"
+  "child></object></child><child type=\"label\"><object class=\"GtkLabel\""
+  " id=\"label1\"><property name=\"visible\">True</property><property name"
+  "=\"can_focus\">False</property><property name=\"label\" translatable=\""
+  "yes\">&lt;b&gt;Buttons&lt;/b&gt;</property><property name=\"use_markup\""
+  ">True</property></object></child></object><packing><property name=\"exp"
+  "and\">False</property><property name=\"fill\">True</property><property "
+  "name=\"position\">0</property></packing></child><child><object class=\""
+  "GtkFrame\" id=\"laptop-lid-frame\"><property name=\"visible\">True</pro"
+  "perty><property name=\"can_focus\">False</property><property name=\"lab"
+  "el_xalign\">0</property><property name=\"shadow_type\">none</property><"
+  "child><object class=\"GtkGrid\" id=\"table5\"><property name=\"visible\""
+  ">True</property><property name=\"can_focus\">False</property><property "
+  "name=\"margin_start\">18</property><property name=\"margin_top\">3</pro"
+  "perty><property name=\"margin_bottom\">18</property><property name=\"ro"
+  "w_spacing\">6</property><property name=\"column_spacing\">18</property>"
+  "<child><object class=\"GtkLabel\" id=\"lid-on-battery-header\"><propert"
+  "y name=\"visible\">True</property><property name=\"can_focus\">False</p"
+  "roperty><property name=\"label\" translatable=\"yes\">On battery</prope"
+  "rty><property name=\"use_markup\">True</property></object><packing><pro"
+  "perty name=\"left_attach\">1</property><property name=\"top_attach\">0<"
+  "/property></packing></child><child><object class=\"GtkLabel\" id=\"lid-"
+  "plugged-in-header\"><property name=\"visible\">True</property><property"
+  " name=\"can_focus\">False</property><property name=\"label\" translatab"
+  "le=\"yes\">Plugged in</property><property name=\"use_markup\">True</pro"
+  "perty></object><packing><property name=\"left_attach\">2</property><pro"
+  "perty name=\"top_attach\">0</property></packing></child><child><object "
+  "class=\"GtkLabel\" id=\"lid-action-label\"><property name=\"visible\">T"
+  "rue</property><property name=\"can_focus\">False</property><property na"
+  "me=\"label\" translatable=\"yes\">When laptop lid is closed:</property>"
+  "<property name=\"xalign\">0</property></object><packing><property name="
+  "\"left_attach\">0</property><property name=\"top_attach\">1</property><"
+  "/packing></child><child><object class=\"GtkComboBox\" id=\"lid-on-batte"
+  "ry-combo\"><property name=\"visible\">True</property><property name=\"c"
+  "an_focus\">False</property><property name=\"hexpand\">True</property><s"
+  "ignal name=\"changed\" handler=\"on_battery_lid_changed_cb\" swapped=\""
+  "no\"/><child><object class=\"GtkCellRendererText\" id=\"renderer9\"/><a"
+  "ttributes><attribute name=\"text\">0</attribute></attributes></child></"
+  "object><packing><property name=\"left_attach\">1</property><property na"
+  "me=\"top_attach\">1</property></packing></child><child><object class=\""
+  "GtkComboBox\" id=\"lid-on-ac-combo\"><property name=\"visible\">True</p"
+  "roperty><property name=\"can_focus\">False</property><property name=\"h"
+  "expand\">True</property><signal name=\"changed\" handler=\"on_ac_lid_ch"
+  "anged_cb\" swapped=\"no\"/><child><object class=\"GtkCellRendererText\""
+  " id=\"renderer10\"/><attributes><attribute name=\"text\">0</attribute><"
+  "/attributes></child></object><packing><property name=\"left_attach\">2<"
+  "/property><property name=\"top_attach\">1</property></packing></child><"
+  "child><placeholder/></child></object></child><child type=\"label\"><obj"
+  "ect class=\"GtkLabel\" id=\"label3\"><property name=\"visible\">True</p"
+  "roperty><property name=\"can_focus\">False</property><property name=\"l"
+  "abel\" translatable=\"yes\">&lt;b&gt;Laptop Lid&lt;/b&gt;</property><pr"
+  "operty name=\"use_markup\">True</property></object></child></object><pa"
   "cking><property name=\"expand\">False</property><property name=\"fill\""
   ">True</property><property name=\"position\">1</property></packing></chi"
-  "ld></object></child><child type=\"label\"><object class=\"GtkLabel\" id"
-  "=\"label9\"><property name=\"visible\">True</property><property name=\""
-  "can_focus\">False</property><property name=\"label\" translatable=\"yes"
-  "\">&lt;b&gt;Critical power&lt;/b&gt;</property><property name=\"use_mar"
-  "kup\">True</property></object></child></object><packing><property name="
-  "\"expand\">False</property><property name=\"fill\">True</property><prop"
-  "erty name=\"position\">1</property></packing></child><child><object cla"
-  "ss=\"GtkFrame\" id=\"security-frame\"><property name=\"visible\">True</"
-  "property><property name=\"can_focus\">False</property><property name=\""
-  "label_xalign\">0</property><property name=\"shadow_type\">none</propert"
-  "y><child><object class=\"GtkBox\" id=\"vbox11\"><property name=\"visibl"
-  "e\">True</property><property name=\"can_focus\">False</property><proper"
-  "ty name=\"orientation\">vertical</property><property name=\"spacing\">6"
-  "</property><property name=\"margin_top\">6</property><property name=\"m"
-  "argin_bottom\">12</property><property name=\"margin_start\">6</property"
-  "><child><object class=\"GtkCheckButton\" id=\"lock-screen\"><property n"
-  "ame=\"label\" translatable=\"yes\">Lock screen when system is going to "
-  "sleep</property><property name=\"visible\">True</property><property nam"
-  "e=\"can_focus\">True</property><property name=\"receives_default\">Fals"
-  "e</property><property name=\"draw_indicator\">True</property><signal na"
-  "me=\"toggled\" handler=\"lock_screen_toggled_cb\" swapped=\"no\"/></obj"
-  "ect><packing><property name=\"expand\">False</property><property name=\""
-  "fill\">True</property><property name=\"position\">0</property></packing"
-  "></child></object></child><child type=\"label\"><object class=\"GtkLabe"
-  "l\" id=\"label5\"><property name=\"visible\">True</property><property n"
-  "ame=\"can_focus\">False</property><property name=\"label\" translatable"
-  "=\"yes\">&lt;b&gt;Security&lt;/b&gt;</property><property name=\"use_mar"
-  "kup\">True</property></object></child></object><packing><property name="
-  "\"expand\">False</property><property name=\"fill\">True</property><prop"
-  "erty name=\"position\">2</property></packing></child></object><packing>"
-  "<property name=\"position\">1</property></packing></child><child type=\""
-  "tab\"><object class=\"GtkLabel\" id=\"system\"><property name=\"visible"
+  "ld><child><object class=\"GtkFrame\" id=\"appearance-frame\"><property "
+  "name=\"visible\">True</property><property name=\"can_focus\">False</pro"
+  "perty><property name=\"label_xalign\">0</property><property name=\"shad"
+  "ow_type\">none</property><child><object class=\"GtkBox\" id=\"vbox10\">"
+  "<property name=\"visible\">True</property><property name=\"can_focus\">"
+  "False</property><property name=\"margin_start\">18</property><property "
+  "name=\"margin_top\">6</property><property name=\"margin_bottom\">18</pr"
+  "operty><property name=\"orientation\">vertical</property><property name"
+  "=\"spacing\">6</property><child><object class=\"GtkBox\" id=\"hbox20\">"
+  "<property name=\"visible\">True</property><property name=\"can_focus\">"
+  "False</property><child><object class=\"GtkLabel\" id=\"show-notificatio"
+  "ns-label\"><property name=\"visible\">True</property><property name=\"c"
+  "an_focus\">False</property><property name=\"label\" translatable=\"yes\""
+  ">Status notifications</property><property name=\"use_underline\">True</"
+  "property><property name=\"ellipsize\">end</property><property name=\"xa"
+  "lign\">0</property></object><packing><property name=\"expand\">True</pr"
+  "operty><property name=\"fill\">True</property><property name=\"position"
+  "\">0</property></packing></child><child><object class=\"GtkSwitch\" id="
+  "\"show-notifications\"><property name=\"visible\">True</property><prope"
+  "rty name=\"can_focus\">True</property><property name=\"halign\">end</pr"
+  "operty></object><packing><property name=\"expand\">False</property><pro"
+  "perty name=\"fill\">True</property><property name=\"position\">1</prope"
+  "rty></packing></child></object><packing><property name=\"expand\">True<"
+  "/property><property name=\"fill\">True</property><property name=\"posit"
+  "ion\">1</property></packing></child><child><object class=\"GtkBox\" id="
+  "\"hbox21\"><property name=\"visible\">True</property><property name=\"c"
+  "an_focus\">False</property><child><object class=\"GtkLabel\" id=\"show-"
+  "systray-label\"><property name=\"visible\">True</property><property nam"
+  "e=\"can_focus\">False</property><property name=\"label\" translatable=\""
+  "yes\">System tray icon</property><property name=\"use_underline\">True<"
+  "/property><property name=\"ellipsize\">end</property><property name=\"x"
+  "align\">0</property></object><packing><property name=\"expand\">True</p"
+  "roperty><property name=\"fill\">True</property><property name=\"positio"
+  "n\">0</property></packing></child><child><object class=\"GtkSwitch\" id"
+  "=\"show-systray\"><property name=\"visible\">True</property><property n"
+  "ame=\"can_focus\">True</property><property name=\"halign\">end</propert"
+  "y></object><packing><property name=\"expand\">False</property><property"
+  " name=\"fill\">True</property><property name=\"position\">1</property><"
+  "/packing></child></object><packing><property name=\"expand\">True</prop"
+  "erty><property name=\"fill\">True</property><property name=\"position\""
+  ">2</property></packing></child></object></child><child type=\"label\"><"
+  "object class=\"GtkLabel\" id=\"label2\"><property name=\"visible\">True"
+  "</property><property name=\"can_focus\">False</property><property name="
+  "\"label\" translatable=\"yes\">&lt;b&gt;Appearance&lt;/b&gt;</property>"
+  "<property name=\"use_markup\">True</property></object></child></object>"
+  "<packing><property name=\"expand\">False</property><property name=\"fil"
+  "l\">True</property><property name=\"position\">2</property></packing></"
+  "child></object><packing><property name=\"position\">1</property></packi"
+  "ng></child><child type=\"tab\"><object class=\"GtkLabel\" id=\"general\""
+  "><property name=\"visible\">True</property><property name=\"can_focus\""
+  ">False</property><property name=\"label\" translatable=\"yes\">General<"
+  "/property></object><packing><property name=\"position\">1</property><pr"
+  "operty name=\"tab_fill\">False</property></packing></child><child><obje"
+  "ct class=\"GtkBox\" id=\"vbox3\"><property name=\"visible\">True</prope"
+  "rty><property name=\"can_focus\">False</property><property name=\"borde"
+  "r_width\">12</property><property name=\"orientation\">vertical</propert"
+  "y><property name=\"spacing\">6</property><child><object class=\"GtkFram"
+  "e\" id=\"system-sleep-frame\"><property name=\"visible\">True</property"
+  "><property name=\"can_focus\">False</property><property name=\"label_xa"
+  "lign\">0</property><property name=\"shadow_type\">none</property><child"
+  "><object class=\"GtkGrid\" id=\"table2\"><property name=\"visible\">Tru"
+  "e</property><property name=\"can_focus\">False</property><property name"
+  "=\"margin_start\">18</property><property name=\"margin_top\">6</propert"
+  "y><property name=\"margin_bottom\">6</property><property name=\"row_spa"
+  "cing\">6</property><property name=\"column_spacing\">18</property><prop"
+  "erty name=\"column_homogeneous\">True</property><child><object class=\""
+  "GtkLabel\" id=\"system-sleep-on-battery-header\"><property name=\"visib"
+  "le\">True</property><property name=\"can_focus\">False</property><prope"
+  "rty name=\"label\" translatable=\"yes\">On battery</property><property "
+  "name=\"use_markup\">True</property></object><packing><property name=\"l"
+  "eft_attach\">1</property><property name=\"top_attach\">0</property></pa"
+  "cking></child><child><object class=\"GtkLabel\" id=\"system-sleep-plugg"
+  "ed-in-header\"><property name=\"visible\">True</property><property name"
+  "=\"can_focus\">False</property><property name=\"label\" translatable=\""
+  "yes\">Plugged in</property><property name=\"use_markup\">True</property"
+  "></object><packing><property name=\"left_attach\">2</property><property"
+  " name=\"top_attach\">0</property></packing></child><child><object class"
+  "=\"GtkLabel\" id=\"system-sleep-inactivity-label\"><property name=\"vis"
+  "ible\">True</property><property name=\"can_focus\">False</property><pro"
+  "perty name=\"label\" translatable=\"yes\">When inactive for</property><"
+  "property name=\"xalign\">0</property></object><packing><property name=\""
+  "left_attach\">0</property><property name=\"top_attach\">2</property></p"
+  "acking></child><child><object class=\"GtkBox\"><property name=\"visible"
   "\">True</property><property name=\"can_focus\">False</property><propert"
-  "y name=\"label\" translatable=\"yes\">System</property></object><packin"
-  "g><property name=\"position\">1</property><property name=\"tab_fill\">F"
-  "alse</property></packing></child><child><object class=\"GtkBox\" id=\"v"
-  "box6\"><property name=\"visible\">True</property><property name=\"can_f"
-  "ocus\">False</property><property name=\"border_width\">12</property><pr"
-  "operty name=\"orientation\">vertical</property><property name=\"spacing"
-  "\">18</property><child><object class=\"GtkBox\" id=\"dpms-frame\"><prop"
-  "erty name=\"visible\">True</property><property name=\"can_focus\">False"
-  "</property><property name=\"orientation\">vertical</property><child><ob"
-  "ject class=\"GtkBox\" id=\"box3\"><property name=\"visible\">True</prop"
-  "erty><property name=\"can_focus\">False</property><child><object class="
-  "\"GtkLabel\" id=\"dpms-label\"><property name=\"visible\">True</propert"
-  "y><property name=\"can_focus\">False</property><property name=\"label\""
-  " translatable=\"yes\">&lt;b&gt;Display power management&lt;/b&gt;</prop"
-  "erty><property name=\"use_markup\">True</property></object><packing><pr"
-  "operty name=\"expand\">False</property><property name=\"fill\">True</pr"
-  "operty><property name=\"position\">0</property></packing></child><child"
-  "><object class=\"GtkSwitch\" id=\"handle-dpms\"><property name=\"visibl"
-  "e\">True</property><property name=\"can_focus\">True</property><propert"
-  "y name=\"tooltip_text\" translatable=\"yes\">Let the power manager hand"
-  "le display power management (DPMS) instead of X11.</property><signal na"
-  "me=\"state-set\" handler=\"dpms_toggled_cb\" swapped=\"no\"/></object><"
-  "packing><property name=\"expand\">False</property><property name=\"fill"
-  "\">True</property><property name=\"pack_type\">end</property><property "
-  "name=\"position\">1</property></packing></child></object><packing><prop"
-  "erty name=\"expand\">True</property><property name=\"fill\">True</prope"
-  "rty><property name=\"position\">0</property></packing></child><child><o"
-  "bject class=\"GtkBox\" id=\"hbox7\"><property name=\"visible\">True</pr"
-  "operty><property name=\"can_focus\">False</property><property name=\"sp"
-  "acing\">6</property><property name=\"margin_top\">12</property><propert"
-  "y name=\"margin_bottom\">12</property><property name=\"margin_start\">1"
-  "8</property><child><object class=\"GtkBox\" id=\"vbox13\"><property nam"
-  "e=\"visible\">True</property><property name=\"can_focus\">False</proper"
-  "ty><property name=\"orientation\">vertical</property><property name=\"h"
-  "omogeneous\">True</property><child><object class=\"GtkLabel\" id=\"disp"
-  "lay-blank-label\"><property name=\"visible\">True</property><property n"
-  "ame=\"can_focus\">False</property><property name=\"xalign\">0</property"
-  "><property name=\"label\" translatable=\"yes\">Blank after</property></"
-  "object><packing><property name=\"expand\">True</property><property name"
-  "=\"fill\">True</property><property name=\"position\">0</property></pack"
-  "ing></child><child><object class=\"GtkLabel\" id=\"dpms-sleep-label\"><"
-  "property name=\"visible\">True</property><property name=\"can_focus\">F"
-  "alse</property><property name=\"xalign\">0</property><property name=\"l"
-  "abel\" translatable=\"yes\">Put to sleep after</property></object><pack"
-  "ing><property name=\"expand\">True</property><property name=\"fill\">Tr"
-  "ue</property><property name=\"position\">1</property></packing></child>"
-  "<child><object class=\"GtkLabel\" id=\"dpms-off-label\"><property name="
-  "\"visible\">True</property><property name=\"can_focus\">False</property"
-  "><property name=\"xalign\">0</property><property name=\"label\" transla"
-  "table=\"yes\">Switch off after</property></object><packing><property na"
-  "me=\"expand\">True</property><property name=\"fill\">True</property><pr"
+  "y name=\"orientation\">vertical</property><child><object class=\"GtkSca"
+  "le\" id=\"system-sleep-inactivity-on-battery\"><property name=\"visible"
+  "\">True</property><property name=\"can_focus\">True</property><property"
+  " name=\"adjustment\">system-sleep-inactivity-on-battery-adjustment</pro"
+  "perty><property name=\"round_digits\">0</property><property name=\"digi"
+  "ts\">0</property><property name=\"draw_value\">False</property><signal "
+  "name=\"value-changed\" handler=\"inactivity_on_battery_value_changed_cb"
+  "\" swapped=\"no\"/><style><class name=\"xfce4-scale-label\"/></style></"
+  "object><packing><property name=\"expand\">False</property><property nam"
+  "e=\"fill\">True</property><property name=\"position\">0</property></pac"
+  "king></child><child><object class=\"GtkLabel\" id=\"system-sleep-inacti"
+  "vity-on-battery-label\"><property name=\"visible\">True</property><prop"
+  "erty name=\"sensitive\">False</property><property name=\"can_focus\">Fa"
+  "lse</property><property name=\"xalign\">0.5</property></object><packing"
+  "><property name=\"expand\">False</property><property name=\"fill\">True"
+  "</property><property name=\"position\">1</property></packing></child></"
+  "object><packing><property name=\"left_attach\">1</property><property na"
+  "me=\"top_attach\">2</property></packing></child><child><object class=\""
+  "GtkBox\"><property name=\"visible\">True</property><property name=\"can"
+  "_focus\">False</property><property name=\"orientation\">vertical</prope"
+  "rty><child><object class=\"GtkScale\" id=\"system-sleep-inactivity-on-a"
+  "c\"><property name=\"visible\">True</property><property name=\"can_focu"
+  "s\">True</property><property name=\"adjustment\">system-sleep-inactivit"
+  "y-on-ac-adjustment</property><property name=\"round_digits\">0</propert"
+  "y><property name=\"digits\">0</property><property name=\"draw_value\">F"
+  "alse</property><signal name=\"value-changed\" handler=\"inactivity_on_a"
+  "c_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-l"
+  "abel\"/></style></object><packing><property name=\"expand\">False</prop"
+  "erty><property name=\"fill\">True</property><property name=\"position\""
+  ">0</property></packing></child><child><object class=\"GtkLabel\" id=\"s"
+  "ystem-sleep-inactivity-on-ac-label\"><property name=\"visible\">True</p"
+  "roperty><property name=\"sensitive\">False</property><property name=\"c"
+  "an_focus\">False</property><property name=\"xalign\">0.5</property></ob"
+  "ject><packing><property name=\"expand\">True</property><property name=\""
+  "fill\">True</property><property name=\"position\">1</property></packing"
+  "></child></object><packing><property name=\"left_attach\">2</property><"
+  "property name=\"top_attach\">2</property></packing></child><child><obje"
+  "ct class=\"GtkLabel\" id=\"system-sleep-mode-label\"><property name=\"v"
+  "isible\">True</property><property name=\"can_focus\">False</property><p"
+  "roperty name=\"label\" translatable=\"yes\">System sleep mode:</propert"
+  "y><property name=\"xalign\">0</property></object><packing><property nam"
+  "e=\"left_attach\">0</property><property name=\"top_attach\">1</property"
+  "></packing></child><child><object class=\"GtkComboBox\" id=\"system-sle"
+  "ep-mode-on-battery\"><property name=\"visible\">True</property><propert"
+  "y name=\"can_focus\">False</property><property name=\"hexpand\">True</p"
+  "roperty><signal name=\"changed\" handler=\"on_battery_sleep_mode_change"
+  "d_cb\" swapped=\"no\"/><child><object class=\"GtkCellRendererText\" id="
+  "\"renderer8\"/><attributes><attribute name=\"text\">0</attribute></attr"
+  "ibutes></child></object><packing><property name=\"left_attach\">1</prop"
+  "erty><property name=\"top_attach\">1</property></packing></child><child"
+  "><object class=\"GtkComboBox\" id=\"system-sleep-mode-on-ac\"><property"
+  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
+  "operty><property name=\"hexpand\">True</property><signal name=\"changed"
+  "\" handler=\"on_ac_sleep_mode_changed_cb\" swapped=\"no\"/><child><obje"
+  "ct class=\"GtkCellRendererText\" id=\"renderer2\"/><attributes><attribu"
+  "te name=\"text\">0</attribute></attributes></child></object><packing><p"
+  "roperty name=\"left_attach\">2</property><property name=\"top_attach\">"
+  "1</property></packing></child><child><placeholder/></child></object></c"
+  "hild><child type=\"label\"><object class=\"GtkLabel\" id=\"label8\"><pr"
+  "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
+  "se</property><property name=\"label\" translatable=\"yes\">&lt;b&gt;Sys"
+  "tem power saving&lt;/b&gt;</property><property name=\"use_markup\">True"
+  "</property></object></child></object><packing><property name=\"expand\""
+  ">False</property><property name=\"fill\">True</property><property name="
+  "\"position\">0</property></packing></child><child><object class=\"GtkFr"
+  "ame\" id=\"critical-power-frame\"><property name=\"visible\">True</prop"
+  "erty><property name=\"can_focus\">False</property><property name=\"labe"
+  "l_xalign\">0</property><property name=\"shadow_type\">none</property><c"
+  "hild><object class=\"GtkBox\" id=\"vbox4\"><property name=\"visible\">T"
+  "rue</property><property name=\"can_focus\">False</property><property na"
+  "me=\"margin_start\">18</property><property name=\"margin_top\">6</prope"
+  "rty><property name=\"margin_bottom\">12</property><property name=\"orie"
+  "ntation\">vertical</property><property name=\"spacing\">3</property><ch"
+  "ild><object class=\"GtkBox\" id=\"hbox2\"><property name=\"visible\">Tr"
+  "ue</property><property name=\"can_focus\">False</property><property nam"
+  "e=\"spacing\">6</property><child><object class=\"GtkLabel\" id=\"critic"
+  "al-power-level-label\"><property name=\"visible\">True</property><prope"
+  "rty name=\"can_focus\">False</property><property name=\"label\" transla"
+  "table=\"yes\">Critical battery power level:</property><property name=\""
+  "xalign\">0</property></object><packing><property name=\"expand\">False<"
+  "/property><property name=\"fill\">True</property><property name=\"posit"
+  "ion\">0</property></packing></child><child><object class=\"GtkSpinButto"
+  "n\" id=\"critical-power-level-spin\"><property name=\"width_request\">1"
+  "00</property><property name=\"visible\">True</property><property name=\""
+  "can_focus\">True</property><property name=\"invisible_char\">\342\227\217"
+  "</property><property name=\"width_chars\">6</property><property name=\""
+  "primary_icon_activatable\">False</property><property name=\"secondary_i"
+  "con_activatable\">False</property><property name=\"adjustment\">critica"
+  "l-power-level-spin-adjustment</property><signal name=\"value-changed\" "
+  "handler=\"critical_level_value_changed_cb\" swapped=\"no\"/></object><p"
+  "acking><property name=\"expand\">False</property><property name=\"fill\""
+  ">True</property><property name=\"position\">1</property></packing></chi"
+  "ld><child><object class=\"GtkLabel\"><property name=\"visible\">True</p"
+  "roperty><property name=\"can_focus\">False</property><property name=\"l"
+  "abel\" translatable=\"yes\">%</property></object><packing><property nam"
+  "e=\"expand\">False</property><property name=\"fill\">True</property><pr"
   "operty name=\"position\">2</property></packing></child></object><packin"
   "g><property name=\"expand\">False</property><property name=\"fill\">Tru"
   "e</property><property name=\"position\">0</property></packing></child><"
-  "child><object class=\"GtkBox\" id=\"vbox14\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"orientation\">vertical</property><property name=\"homogeneous\">"
-  "True</property><child><object class=\"GtkBox\" id=\"hbox9\"><property n"
-  "ame=\"visible\">True</property><property name=\"can_focus\">False</prop"
-  "erty><property name=\"spacing\">6</property><property name=\"homogeneou"
-  "s\">True</property><child><object class=\"GtkBox\" id=\"display-blank-o"
-  "n-battery-vbox\"><property name=\"visible\">True</property><property na"
-  "me=\"can_focus\">False</property><property name=\"orientation\">vertica"
-  "l</property><child><object class=\"GtkLabel\" id=\"dpms-on-battery-head"
-  "er\"><property name=\"visible\">True</property><property name=\"can_foc"
-  "us\">False</property><property name=\"yalign\">1</property><property na"
-  "me=\"label\" translatable=\"yes\">On battery</property><property name=\""
-  "use_markup\">True</property></object><packing><property name=\"expand\""
-  ">True</property><property name=\"fill\">True</property><property name=\""
-  "position\">0</property></packing></child><child><object class=\"GtkBox\""
-  "><property name=\"visible\">True</property><property name=\"can_focus\""
-  ">False</property><property name=\"orientation\">vertical</property><chi"
-  "ld><object class=\"GtkScale\" id=\"display-blank-on-battery\"><property"
-  " name=\"visible\">True</property><property name=\"can_focus\">True</pro"
-  "perty><property name=\"adjustment\">display-blank-on-battery-adjustment"
-  "</property><property name=\"round_digits\">0</property><property name=\""
-  "digits\">0</property><property name=\"draw-value\">False</property><sig"
-  "nal name=\"value-changed\" handler=\"display_blank_on_battery_value_cha"
-  "nged_cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-label\"/></s"
-  "tyle></object></child><child><object class=\"GtkLabel\" id=\"display-bl"
-  "ank-on-battery-label\"><property name=\"visible\">True</property><prope"
-  "rty name=\"can_focus\">False</property><property name=\"sensitive\">Fal"
-  "se</property><property name=\"xalign\">0.5</property></object></child><"
-  "/object><packing><property name=\"expand\">True</property><property nam"
-  "e=\"fill\">True</property><property name=\"position\">1</property></pac"
-  "king></child></object><packing><property name=\"expand\">True</property"
-  "><property name=\"fill\">True</property><property name=\"position\">0</"
-  "property></packing></child><child><object class=\"GtkBox\" id=\"vbox17\""
-  "><property name=\"visible\">True</property><property name=\"can_focus\""
-  ">False</property><property name=\"orientation\">vertical</property><chi"
-  "ld><object class=\"GtkLabel\" id=\"dpms-plugged-in-header\"><property n"
-  "ame=\"visible\">True</property><property name=\"can_focus\">False</prop"
-  "erty><property name=\"yalign\">1</property><property name=\"label\" tra"
-  "nslatable=\"yes\">Plugged in</property><property name=\"use_markup\">Tr"
-  "ue</property></object><packing><property name=\"expand\">True</property"
-  "><property name=\"fill\">True</property><property name=\"position\">0</"
-  "property></packing></child><child><object class=\"GtkBox\"><property na"
-  "me=\"visible\">True</property><property name=\"can_focus\">False</prope"
-  "rty><property name=\"orientation\">vertical</property><child><object cl"
-  "ass=\"GtkScale\" id=\"display-blank-on-ac\"><property name=\"visible\">"
-  "True</property><property name=\"can_focus\">True</property><property na"
-  "me=\"adjustment\">display-blank-on-ac-adjustment</property><property na"
-  "me=\"round_digits\">0</property><property name=\"digits\">0</property><"
-  "property name=\"draw-value\">False</property><signal name=\"value-chang"
-  "ed\" handler=\"display_blank_on_ac_value_changed_cb\" swapped=\"no\"/><"
-  "style><class name=\"xfce4-scale-label\"/></style></object></child><chil"
-  "d><object class=\"GtkLabel\" id=\"display-blank-on-ac-label\"><property"
-  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
-  "operty><property name=\"sensitive\">False</property><property name=\"xa"
-  "lign\">0.5</property></object></child></object><packing><property name="
-  "\"expand\">True</property><property name=\"fill\">True</property><prope"
-  "rty name=\"position\">1</property></packing></child></object><packing><"
-  "property name=\"expand\">True</property><property name=\"fill\">True</p"
-  "roperty><property name=\"position\">1</property></packing></child></obj"
-  "ect><packing><property name=\"expand\">True</property><property name=\""
-  "fill\">True</property><property name=\"position\">0</property></packing"
-  "></child><child><object class=\"GtkBox\" id=\"hbox10\"><property name=\""
+  "child><object class=\"GtkBox\" id=\"hbox3\"><property name=\"visible\">"
+  "True</property><property name=\"can_focus\">False</property><property n"
+  "ame=\"spacing\">6</property><child><object class=\"GtkLabel\" id=\"crit"
+  "ical-power-action-label\"><property name=\"visible\">True</property><pr"
+  "operty name=\"can_focus\">False</property><property name=\"label\" tran"
+  "slatable=\"yes\">On critical battery power:</property><property name=\""
+  "xalign\">0</property></object><packing><property name=\"expand\">False<"
+  "/property><property name=\"fill\">True</property><property name=\"posit"
+  "ion\">0</property></packing></child><child><object class=\"GtkComboBox\""
+  " id=\"critical-power-action-combo\"><property name=\"visible\">True</pr"
+  "operty><property name=\"can_focus\">False</property><signal name=\"chan"
+  "ged\" handler=\"battery_critical_changed_cb\" swapped=\"no\"/><child><o"
+  "bject class=\"GtkCellRendererText\" id=\"renderer7\"/><attributes><attr"
+  "ibute name=\"text\">0</attribute></attributes></child></object><packing"
+  "><property name=\"expand\">True</property><property name=\"fill\">True<"
+  "/property><property name=\"position\">1</property></packing></child></o"
+  "bject><packing><property name=\"expand\">False</property><property name"
+  "=\"fill\">True</property><property name=\"position\">1</property></pack"
+  "ing></child></object></child><child type=\"label\"><object class=\"GtkL"
+  "abel\" id=\"label9\"><property name=\"visible\">True</property><propert"
+  "y name=\"can_focus\">False</property><property name=\"label\" translata"
+  "ble=\"yes\">&lt;b&gt;Critical power&lt;/b&gt;</property><property name="
+  "\"use_markup\">True</property></object></child></object><packing><prope"
+  "rty name=\"expand\">False</property><property name=\"fill\">True</prope"
+  "rty><property name=\"position\">1</property></packing></child><child><o"
+  "bject class=\"GtkFrame\" id=\"security-frame\"><property name=\"visible"
+  "\">True</property><property name=\"can_focus\">False</property><propert"
+  "y name=\"label_xalign\">0</property><property name=\"shadow_type\">none"
+  "</property><child><object class=\"GtkBox\" id=\"vbox11\"><property name"
+  "=\"visible\">True</property><property name=\"can_focus\">False</propert"
+  "y><property name=\"margin_start\">6</property><property name=\"margin_t"
+  "op\">6</property><property name=\"margin_bottom\">12</property><propert"
+  "y name=\"orientation\">vertical</property><property name=\"spacing\">6<"
+  "/property><child><object class=\"GtkCheckButton\" id=\"lock-screen\"><p"
+  "roperty name=\"label\" translatable=\"yes\">Lock screen when system is "
+  "going to sleep</property><property name=\"visible\">True</property><pro"
+  "perty name=\"can_focus\">True</property><property name=\"receives_defau"
+  "lt\">False</property><property name=\"draw_indicator\">True</property><"
+  "signal name=\"toggled\" handler=\"lock_screen_toggled_cb\" swapped=\"no"
+  "\"/></object><packing><property name=\"expand\">False</property><proper"
+  "ty name=\"fill\">True</property><property name=\"position\">0</property"
+  "></packing></child></object></child><child type=\"label\"><object class"
+  "=\"GtkLabel\" id=\"label5\"><property name=\"visible\">True</property><"
+  "property name=\"can_focus\">False</property><property name=\"label\" tr"
+  "anslatable=\"yes\">&lt;b&gt;Security&lt;/b&gt;</property><property name"
+  "=\"use_markup\">True</property></object></child></object><packing><prop"
+  "erty name=\"expand\">False</property><property name=\"fill\">True</prop"
+  "erty><property name=\"position\">2</property></packing></child></object"
+  "><packing><property name=\"position\">1</property></packing></child><ch"
+  "ild type=\"tab\"><object class=\"GtkLabel\" id=\"system\"><property nam"
+  "e=\"visible\">True</property><property name=\"can_focus\">False</proper"
+  "ty><property name=\"label\" translatable=\"yes\">System</property></obj"
+  "ect><packing><property name=\"position\">1</property><property name=\"t"
+  "ab_fill\">False</property></packing></child><child><object class=\"GtkB"
+  "ox\" id=\"vbox6\"><property name=\"visible\">True</property><property n"
+  "ame=\"can_focus\">False</property><property name=\"border_width\">12</p"
+  "roperty><property name=\"orientation\">vertical</property><property nam"
+  "e=\"spacing\">18</property><child><object class=\"GtkBox\" id=\"dpms-fr"
+  "ame\"><property name=\"visible\">True</property><property name=\"can_fo"
+  "cus\">False</property><property name=\"orientation\">vertical</property"
+  "><child><object class=\"GtkBox\" id=\"box3\"><property name=\"visible\""
+  ">True</property><property name=\"can_focus\">False</property><child><ob"
+  "ject class=\"GtkLabel\" id=\"dpms-label\"><property name=\"visible\">Tr"
+  "ue</property><property name=\"can_focus\">False</property><property nam"
+  "e=\"label\" translatable=\"yes\">&lt;b&gt;Display power management&lt;/"
+  "b&gt;</property><property name=\"use_markup\">True</property></object><"
+  "packing><property name=\"expand\">False</property><property name=\"fill"
+  "\">True</property><property name=\"position\">0</property></packing></c"
+  "hild><child><object class=\"GtkSwitch\" id=\"handle-dpms\"><property na"
+  "me=\"visible\">True</property><property name=\"can_focus\">True</proper"
+  "ty><property name=\"tooltip_text\" translatable=\"yes\">Let the power m"
+  "anager handle display power management (DPMS) instead of X11.</property"
+  "><signal name=\"state-set\" handler=\"dpms_toggled_cb\" swapped=\"no\"/"
+  "></object><packing><property name=\"expand\">False</property><property "
+  "name=\"fill\">True</property><property name=\"pack_type\">end</property"
+  "><property name=\"position\">1</property></packing></child></object><pa"
+  "cking><property name=\"expand\">True</property><property name=\"fill\">"
+  "True</property><property name=\"position\">0</property></packing></chil"
+  "d><child><object class=\"GtkBox\" id=\"hbox7\"><property name=\"visible"
+  "\">True</property><property name=\"can_focus\">False</property><propert"
+  "y name=\"margin_start\">18</property><property name=\"margin_top\">12</"
+  "property><property name=\"margin_bottom\">12</property><property name=\""
+  "spacing\">6</property><child><object class=\"GtkBox\" id=\"vbox13\"><pr"
+  "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
+  "se</property><property name=\"orientation\">vertical</property><propert"
+  "y name=\"homogeneous\">True</property><child><object class=\"GtkLabel\""
+  " id=\"display-blank-label\"><property name=\"visible\">True</property><"
+  "property name=\"can_focus\">False</property><property name=\"label\" tr"
+  "anslatable=\"yes\">Blank after</property><property name=\"xalign\">0</p"
+  "roperty></object><packing><property name=\"expand\">True</property><pro"
+  "perty name=\"fill\">True</property><property name=\"position\">0</prope"
+  "rty></packing></child><child><object class=\"GtkLabel\" id=\"dpms-sleep"
+  "-label\"><property name=\"visible\">True</property><property name=\"can"
+  "_focus\">False</property><property name=\"label\" translatable=\"yes\">"
+  "Put to sleep after</property><property name=\"xalign\">0</property></ob"
+  "ject><packing><property name=\"expand\">True</property><property name=\""
+  "fill\">True</property><property name=\"position\">1</property></packing"
+  "></child><child><object class=\"GtkLabel\" id=\"dpms-off-label\"><prope"
+  "rty name=\"visible\">True</property><property name=\"can_focus\">False<"
+  "/property><property name=\"label\" translatable=\"yes\">Switch off afte"
+  "r</property><property name=\"xalign\">0</property></object><packing><pr"
+  "operty name=\"expand\">True</property><property name=\"fill\">True</pro"
+  "perty><property name=\"position\">2</property></packing></child></objec"
+  "t><packing><property name=\"expand\">False</property><property name=\"f"
+  "ill\">True</property><property name=\"position\">0</property></packing>"
+  "</child><child><object class=\"GtkBox\" id=\"vbox14\"><property name=\""
   "visible\">True</property><property name=\"can_focus\">False</property><"
-  "property name=\"spacing\">6</property><property name=\"homogeneous\">Tr"
-  "ue</property><property name=\"valign\">center</property><child><object "
-  "class=\"GtkBox\"><property name=\"visible\">True</property><property na"
-  "me=\"can_focus\">False</property><property name=\"orientation\">vertica"
-  "l</property><child><object class=\"GtkScale\" id=\"dpms-sleep-on-batter"
-  "y\"><property name=\"visible\">True</property><property name=\"can_focu"
-  "s\">True</property><property name=\"adjustment\">dpms-sleep-on-battery-"
+  "property name=\"orientation\">vertical</property><property name=\"homog"
+  "eneous\">True</property><child><object class=\"GtkBox\" id=\"hbox9\"><p"
+  "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa"
+  "lse</property><property name=\"spacing\">6</property><property name=\"h"
+  "omogeneous\">True</property><child><object class=\"GtkBox\" id=\"displa"
+  "y-blank-on-battery-vbox\"><property name=\"visible\">True</property><pr"
+  "operty name=\"can_focus\">False</property><property name=\"orientation\""
+  ">vertical</property><child><object class=\"GtkLabel\" id=\"dpms-on-batt"
+  "ery-header\"><property name=\"visible\">True</property><property name=\""
+  "can_focus\">False</property><property name=\"label\" translatable=\"yes"
+  "\">On battery</property><property name=\"use_markup\">True</property><p"
+  "roperty name=\"yalign\">1</property></object><packing><property name=\""
+  "expand\">True</property><property name=\"fill\">True</property><propert"
+  "y name=\"position\">0</property></packing></child><child><object class="
+  "\"GtkBox\"><property name=\"visible\">True</property><property name=\"c"
+  "an_focus\">False</property><property name=\"orientation\">vertical</pro"
+  "perty><child><object class=\"GtkScale\" id=\"display-blank-on-battery\""
+  "><property name=\"visible\">True</property><property name=\"can_focus\""
+  ">True</property><property name=\"adjustment\">display-blank-on-battery-"
   "adjustment</property><property name=\"round_digits\">0</property><prope"
-  "rty name=\"digits\">0</property><property name=\"draw-value\">False</pr"
-  "operty><signal name=\"value-changed\" handler=\"sleep_on_battery_value_"
-  "changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-label\"/>"
-  "</style></object></child><child><object class=\"GtkLabel\" id=\"dpms-sl"
-  "eep-on-battery-label\"><property name=\"visible\">True</property><prope"
-  "rty name=\"can_focus\">False</property><property name=\"sensitive\">Fal"
-  "se</property><property name=\"xalign\">0.5</property></object></child><"
-  "/object><packing><property name=\"expand\">True</property><property nam"
-  "e=\"fill\">True</property><property name=\"position\">0</property></pac"
-  "king></child><child><object class=\"GtkBox\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"orientation\">vertical</property><child><object class=\"GtkScale"
-  "\" id=\"dpms-sleep-on-ac\"><property name=\"visible\">True</property><p"
-  "roperty name=\"can_focus\">True</property><property name=\"adjustment\""
-  ">dpms-sleep-on-ac-adjustment</property><property name=\"round_digits\">"
-  "0</property><property name=\"digits\">0</property><property name=\"draw"
-  "-value\">False</property><signal name=\"value-changed\" handler=\"sleep"
-  "_on_ac_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-sc"
-  "ale-label\"/></style></object></child><child><object class=\"GtkLabel\""
-  " id=\"dpms-sleep-on-ac-label\"><property name=\"visible\">True</propert"
-  "y><property name=\"can_focus\">False</property><property name=\"sensiti"
-  "ve\">False</property><property name=\"xalign\">0.5</property></object><"
-  "/child></object><packing><property name=\"expand\">True</property><prop"
-  "erty name=\"fill\">True</property><property name=\"position\">1</proper"
-  "ty></packing></child></object><packing><property name=\"expand\">True</"
+  "rty name=\"digits\">0</property><property name=\"draw_value\">False</pr"
+  "operty><signal name=\"value-changed\" handler=\"display_blank_on_batter"
+  "y_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-l"
+  "abel\"/></style></object><packing><property name=\"expand\">False</prop"
+  "erty><property name=\"fill\">True</property><property name=\"position\""
+  ">0</property></packing></child><child><object class=\"GtkLabel\" id=\"d"
+  "isplay-blank-on-battery-label\"><property name=\"visible\">True</proper"
+  "ty><property name=\"sensitive\">False</property><property name=\"can_fo"
+  "cus\">False</property><property name=\"xalign\">0.5</property></object>"
+  "<packing><property name=\"expand\">False</property><property name=\"fil"
+  "l\">True</property><property name=\"position\">1</property></packing></"
+  "child></object><packing><property name=\"expand\">True</property><prope"
+  "rty name=\"fill\">True</property><property name=\"position\">1</propert"
+  "y></packing></child></object><packing><property name=\"expand\">True</p"
+  "roperty><property name=\"fill\">True</property><property name=\"positio"
+  "n\">0</property></packing></child><child><object class=\"GtkBox\" id=\""
+  "vbox17\"><property name=\"visible\">True</property><property name=\"can"
+  "_focus\">False</property><property name=\"orientation\">vertical</prope"
+  "rty><child><object class=\"GtkLabel\" id=\"dpms-plugged-in-header\"><pr"
+  "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
+  "se</property><property name=\"label\" translatable=\"yes\">Plugged in</"
+  "property><property name=\"use_markup\">True</property><property name=\""
+  "yalign\">1</property></object><packing><property name=\"expand\">True</"
   "property><property name=\"fill\">True</property><property name=\"positi"
-  "on\">1</property></packing></child><child><object class=\"GtkBox\" id=\""
-  "hbox11\"><property name=\"visible\">True</property><property name=\"can"
-  "_focus\">False</property><property name=\"spacing\">6</property><proper"
-  "ty name=\"homogeneous\">True</property><property name=\"valign\">center"
-  "</property><child><object class=\"GtkBox\"><property name=\"visible\">T"
+  "on\">0</property></packing></child><child><object class=\"GtkBox\"><pro"
+  "perty name=\"visible\">True</property><property name=\"can_focus\">Fals"
+  "e</property><property name=\"orientation\">vertical</property><child><o"
+  "bject class=\"GtkScale\" id=\"display-blank-on-ac\"><property name=\"vi"
+  "sible\">True</property><property name=\"can_focus\">True</property><pro"
+  "perty name=\"adjustment\">display-blank-on-ac-adjustment</property><pro"
+  "perty name=\"round_digits\">0</property><property name=\"digits\">0</pr"
+  "operty><property name=\"draw_value\">False</property><signal name=\"val"
+  "ue-changed\" handler=\"display_blank_on_ac_value_changed_cb\" swapped=\""
+  "no\"/><style><class name=\"xfce4-scale-label\"/></style></object><packi"
+  "ng><property name=\"expand\">False</property><property name=\"fill\">Tr"
+  "ue</property><property name=\"position\">0</property></packing></child>"
+  "<child><object class=\"GtkLabel\" id=\"display-blank-on-ac-label\"><pro"
+  "perty name=\"visible\">True</property><property name=\"sensitive\">Fals"
+  "e</property><property name=\"can_focus\">False</property><property name"
+  "=\"xalign\">0.5</property></object><packing><property name=\"expand\">F"
+  "alse</property><property name=\"fill\">True</property><property name=\""
+  "position\">1</property></packing></child></object><packing><property na"
+  "me=\"expand\">True</property><property name=\"fill\">True</property><pr"
+  "operty name=\"position\">1</property></packing></child></object><packin"
+  "g><property name=\"expand\">True</property><property name=\"fill\">True"
+  "</property><property name=\"position\">1</property></packing></child></"
+  "object><packing><property name=\"expand\">True</property><property name"
+  "=\"fill\">True</property><property name=\"position\">0</property></pack"
+  "ing></child><child><object class=\"GtkBox\" id=\"hbox10\"><property nam"
+  "e=\"visible\">True</property><property name=\"can_focus\">False</proper"
+  "ty><property name=\"valign\">center</property><property name=\"spacing\""
+  ">6</property><property name=\"homogeneous\">True</property><child><obje"
+  "ct class=\"GtkBox\"><property name=\"visible\">True</property><property"
+  " name=\"can_focus\">False</property><property name=\"orientation\">vert"
+  "ical</property><child><object class=\"GtkScale\" id=\"dpms-sleep-on-bat"
+  "tery\"><property name=\"visible\">True</property><property name=\"can_f"
+  "ocus\">True</property><property name=\"adjustment\">dpms-sleep-on-batte"
+  "ry-adjustment</property><property name=\"round_digits\">0</property><pr"
+  "operty name=\"digits\">0</property><property name=\"draw_value\">False<"
+  "/property><signal name=\"value-changed\" handler=\"sleep_on_battery_val"
+  "ue_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-label\""
+  "/></style></object><packing><property name=\"expand\">False</property><"
+  "property name=\"fill\">True</property><property name=\"position\">0</pr"
+  "operty></packing></child><child><object class=\"GtkLabel\" id=\"dpms-sl"
+  "eep-on-battery-label\"><property name=\"visible\">True</property><prope"
+  "rty name=\"sensitive\">False</property><property name=\"can_focus\">Fal"
+  "se</property><property name=\"xalign\">0.5</property></object><packing>"
+  "<property name=\"expand\">False</property><property name=\"fill\">True<"
+  "/property><property name=\"position\">1</property></packing></child></o"
+  "bject><packing><property name=\"expand\">True</property><property name="
+  "\"fill\">True</property><property name=\"position\">0</property></packi"
+  "ng></child><child><object class=\"GtkBox\"><property name=\"visible\">T"
   "rue</property><property name=\"can_focus\">False</property><property na"
   "me=\"orientation\">vertical</property><child><object class=\"GtkScale\""
-  " id=\"dpms-off-on-battery\"><property name=\"visible\">True</property><"
-  "property name=\"can_focus\">True</property><property name=\"adjustment\""
-  ">dpms-off-on-battery-adjustment</property><property name=\"round_digits"
-  "\">0</property><property name=\"digits\">0</property><property name=\"d"
-  "raw-value\">False</property><signal name=\"value-changed\" handler=\"of"
-  "f_on_battery_value_changed_cb\" swapped=\"no\"/><style><class name=\"xf"
-  "ce4-scale-label\"/></style></object></child><child><object class=\"GtkL"
-  "abel\" id=\"dpms-off-on-battery-label\"><property name=\"visible\">True"
+  " id=\"dpms-sleep-on-ac\"><property name=\"visible\">True</property><pro"
+  "perty name=\"can_focus\">True</property><property name=\"adjustment\">d"
+  "pms-sleep-on-ac-adjustment</property><property name=\"round_digits\">0<"
+  "/property><property name=\"digits\">0</property><property name=\"draw_v"
+  "alue\">False</property><signal name=\"value-changed\" handler=\"sleep_o"
+  "n_ac_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-scal"
+  "e-label\"/></style></object><packing><property name=\"expand\">False</p"
+  "roperty><property name=\"fill\">True</property><property name=\"positio"
+  "n\">0</property></packing></child><child><object class=\"GtkLabel\" id="
+  "\"dpms-sleep-on-ac-label\"><property name=\"visible\">True</property><p"
+  "roperty name=\"sensitive\">False</property><property name=\"can_focus\""
+  ">False</property><property name=\"xalign\">0.5</property></object><pack"
+  "ing><property name=\"expand\">False</property><property name=\"fill\">T"
+  "rue</property><property name=\"position\">1</property></packing></child"
+  "></object><packing><property name=\"expand\">True</property><property n"
+  "ame=\"fill\">True</property><property name=\"position\">1</property></p"
+  "acking></child></object><packing><property name=\"expand\">True</proper"
+  "ty><property name=\"fill\">True</property><property name=\"position\">1"
+  "</property></packing></child><child><object class=\"GtkBox\" id=\"hbox1"
+  "1\"><property name=\"visible\">True</property><property name=\"can_focu"
+  "s\">False</property><property name=\"valign\">center</property><propert"
+  "y name=\"spacing\">6</property><property name=\"homogeneous\">True</pro"
+  "perty><child><object class=\"GtkBox\"><property name=\"visible\">True</"
+  "property><property name=\"can_focus\">False</property><property name=\""
+  "orientation\">vertical</property><child><object class=\"GtkScale\" id=\""
+  "dpms-off-on-battery\"><property name=\"visible\">True</property><proper"
+  "ty name=\"can_focus\">True</property><property name=\"adjustment\">dpms"
+  "-off-on-battery-adjustment</property><property name=\"round_digits\">0<"
+  "/property><property name=\"digits\">0</property><property name=\"draw_v"
+  "alue\">False</property><signal name=\"value-changed\" handler=\"off_on_"
+  "battery_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-s"
+  "cale-label\"/></style></object><packing><property name=\"expand\">False"
+  "</property><property name=\"fill\">True</property><property name=\"posi"
+  "tion\">0</property></packing></child><child><object class=\"GtkLabel\" "
+  "id=\"dpms-off-on-battery-label\"><property name=\"visible\">True</prope"
+  "rty><property name=\"sensitive\">False</property><property name=\"can_f"
+  "ocus\">False</property><property name=\"xalign\">0.5</property></object"
+  "><packing><property name=\"expand\">False</property><property name=\"fi"
+  "ll\">True</property><property name=\"position\">1</property></packing><"
+  "/child></object><packing><property name=\"expand\">True</property><prop"
+  "erty name=\"fill\">True</property><property name=\"position\">0</proper"
+  "ty></packing></child><child><object class=\"GtkBox\"><property name=\"v"
+  "isible\">True</property><property name=\"can_focus\">False</property><p"
+  "roperty name=\"orientation\">vertical</property><child><object class=\""
+  "GtkScale\" id=\"dpms-off-on-ac\"><property name=\"visible\">True</prope"
+  "rty><property name=\"can_focus\">True</property><property name=\"adjust"
+  "ment\">dpms-off-on-ac-adjustment</property><property name=\"round_digit"
+  "s\">0</property><property name=\"digits\">0</property><property name=\""
+  "draw_value\">False</property><signal name=\"value-changed\" handler=\"o"
+  "ff_on_ac_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-"
+  "scale-label\"/></style></object><packing><property name=\"expand\">Fals"
+  "e</property><property name=\"fill\">True</property><property name=\"pos"
+  "ition\">0</property></packing></child><child><object class=\"GtkLabel\""
+  " id=\"dpms-off-on-ac-label\"><property name=\"visible\">True</property>"
+  "<property name=\"sensitive\">False</property><property name=\"can_focus"
+  "\">False</property><property name=\"xalign\">0.5</property></object><pa"
+  "cking><property name=\"expand\">False</property><property name=\"fill\""
+  ">True</property><property name=\"position\">1</property></packing></chi"
+  "ld></object><packing><property name=\"expand\">True</property><property"
+  " name=\"fill\">True</property><property name=\"position\">1</property><"
+  "/packing></child></object><packing><property name=\"expand\">True</prop"
+  "erty><property name=\"fill\">True</property><property name=\"position\""
+  ">2</property></packing></child></object><packing><property name=\"expan"
+  "d\">True</property><property name=\"fill\">True</property><property nam"
+  "e=\"position\">1</property></packing></child></object><packing><propert"
+  "y name=\"expand\">False</property><property name=\"fill\">True</propert"
+  "y><property name=\"position\">1</property></packing></child></object><p"
+  "acking><property name=\"expand\">False</property><property name=\"fill\""
+  ">True</property><property name=\"position\">0</property></packing></chi"
+  "ld><child><object class=\"GtkFrame\" id=\"brightness-frame\"><property "
+  "name=\"visible\">True</property><property name=\"can_focus\">False</pro"
+  "perty><property name=\"label_xalign\">0</property><property name=\"shad"
+  "ow_type\">none</property><child><object class=\"GtkBox\" id=\"vbox5\"><"
+  "property name=\"visible\">True</property><property name=\"can_focus\">F"
+  "alse</property><property name=\"margin_start\">18</property><property n"
+  "ame=\"margin_bottom\">12</property><property name=\"orientation\">verti"
+  "cal</property><child><object class=\"GtkBox\" id=\"hbox1\"><property na"
+  "me=\"visible\">True</property><property name=\"can_focus\">False</prope"
+  "rty><property name=\"spacing\">6</property><child><object class=\"GtkBo"
+  "x\" id=\"vbox12\"><property name=\"visible\">True</property><property n"
+  "ame=\"can_focus\">False</property><property name=\"orientation\">vertic"
+  "al</property><property name=\"homogeneous\">True</property><child><obje"
+  "ct class=\"GtkLabel\" id=\"brightness-level-label\"><property name=\"vi"
+  "sible\">True</property><property name=\"can_focus\">False</property><pr"
+  "operty name=\"label\" translatable=\"yes\">On inactivity reduce to</pro"
+  "perty><property name=\"xalign\">0</property></object><packing><property"
+  " name=\"expand\">True</property><property name=\"fill\">True</property>"
+  "<property name=\"position\">0</property></packing></child><child><objec"
+  "t class=\"GtkLabel\" id=\"brightness-inactivity-label\"><property name="
+  "\"visible\">True</property><property name=\"can_focus\">False</property"
+  "><property name=\"label\" translatable=\"yes\">Reduce after</property><"
+  "property name=\"xalign\">0</property></object><packing><property name=\""
+  "expand\">True</property><property name=\"fill\">True</property><propert"
+  "y name=\"position\">1</property></packing></child></object><packing><pr"
+  "operty name=\"expand\">False</property><property name=\"fill\">True</pr"
+  "operty><property name=\"position\">0</property></packing></child><child"
+  "><object class=\"GtkBox\" id=\"vbox15\"><property name=\"visible\">True"
   "</property><property name=\"can_focus\">False</property><property name="
-  "\"sensitive\">False</property><property name=\"xalign\">0.5</property><"
-  "/object></child></object><packing><property name=\"expand\">True</prope"
-  "rty><property name=\"fill\">True</property><property name=\"position\">"
-  "0</property></packing></child><child><object class=\"GtkBox\"><property"
-  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
-  "operty><property name=\"orientation\">vertical</property><child><object"
-  " class=\"GtkScale\" id=\"dpms-off-on-ac\"><property name=\"visible\">Tr"
-  "ue</property><property name=\"can_focus\">True</property><property name"
-  "=\"adjustment\">dpms-off-on-ac-adjustment</property><property name=\"ro"
-  "und_digits\">0</property><property name=\"digits\">0</property><propert"
-  "y name=\"draw-value\">False</property><signal name=\"value-changed\" ha"
-  "ndler=\"off_on_ac_value_changed_cb\" swapped=\"no\"/><style><class name"
-  "=\"xfce4-scale-label\"/></style></object></child><child><object class=\""
-  "GtkLabel\" id=\"dpms-off-on-ac-label\"><property name=\"visible\">True<"
-  "/property><property name=\"can_focus\">False</property><property name=\""
-  "sensitive\">False</property><property name=\"xalign\">0.5</property></o"
-  "bject></child></object><packing><property name=\"expand\">True</propert"
+  "\"orientation\">vertical</property><property name=\"homogeneous\">True<"
+  "/property><child><object class=\"GtkBox\" id=\"hbox5\"><property name=\""
+  "visible\">True</property><property name=\"can_focus\">False</property><"
+  "property name=\"valign\">center</property><property name=\"spacing\">6<"
+  "/property><property name=\"homogeneous\">True</property><child><object "
+  "class=\"GtkBox\" id=\"vbox18\"><property name=\"visible\">True</propert"
+  "y><property name=\"can_focus\">False</property><property name=\"orienta"
+  "tion\">vertical</property><child><object class=\"GtkLabel\" id=\"bright"
+  "ness-on-battery-header\"><property name=\"visible\">True</property><pro"
+  "perty name=\"can_focus\">False</property><property name=\"label\" trans"
+  "latable=\"yes\">On battery</property><property name=\"use_markup\">True"
+  "</property><property name=\"yalign\">1</property></object><packing><pro"
+  "perty name=\"expand\">True</property><property name=\"fill\">True</prop"
+  "erty><property name=\"position\">0</property></packing></child><child><"
+  "object class=\"GtkBox\"><property name=\"visible\">True</property><prop"
+  "erty name=\"can_focus\">False</property><property name=\"orientation\">"
+  "vertical</property><child><object class=\"GtkScale\" id=\"brightness-le"
+  "vel-on-battery\"><property name=\"visible\">True</property><property na"
+  "me=\"can_focus\">True</property><property name=\"adjustment\">brightnes"
+  "s-level-on-battery-adjustment</property><property name=\"round_digits\""
+  ">0</property><property name=\"digits\">0</property><property name=\"dra"
+  "w_value\">False</property><signal name=\"value-changed\" handler=\"brig"
+  "htness_level_on_battery\" swapped=\"no\"/><style><class name=\"xfce4-sc"
+  "ale-label\"/></style></object><packing><property name=\"expand\">False<"
+  "/property><property name=\"fill\">True</property><property name=\"posit"
+  "ion\">0</property></packing></child><child><object class=\"GtkLabel\" i"
+  "d=\"brightness-level-on-battery-label\"><property name=\"visible\">True"
+  "</property><property name=\"sensitive\">False</property><property name="
+  "\"can_focus\">False</property><property name=\"xalign\">0.5</property><"
+  "/object><packing><property name=\"expand\">False</property><property na"
+  "me=\"fill\">True</property><property name=\"position\">1</property></pa"
+  "cking></child></object><packing><property name=\"expand\">True</propert"
   "y><property name=\"fill\">True</property><property name=\"position\">1<"
   "/property></packing></child></object><packing><property name=\"expand\""
   ">True</property><property name=\"fill\">True</property><property name=\""
-  "position\">2</property></packing></child></object><packing><property na"
-  "me=\"expand\">True</property><property name=\"fill\">True</property><pr"
-  "operty name=\"position\">1</property></packing></child></object><packin"
-  "g><property name=\"expand\">False</property><property name=\"fill\">Tru"
-  "e</property><property name=\"position\">1</property></packing></child><"
+  "position\">0</property></packing></child><child><object class=\"GtkBox\""
+  " id=\"vbox19\"><property name=\"visible\">True</property><property name"
+  "=\"can_focus\">False</property><property name=\"orientation\">vertical<"
+  "/property><child><object class=\"GtkLabel\" id=\"brightness-plugged-in-"
+  "header\"><property name=\"visible\">True</property><property name=\"can"
+  "_focus\">False</property><property name=\"label\" translatable=\"yes\">"
+  "Plugged in</property><property name=\"use_markup\">True</property><prop"
+  "erty name=\"yalign\">1</property></object><packing><property name=\"exp"
+  "and\">True</property><property name=\"fill\">True</property><property n"
+  "ame=\"position\">0</property></packing></child><child><object class=\"G"
+  "tkBox\"><property name=\"visible\">True</property><property name=\"can_"
+  "focus\">False</property><property name=\"orientation\">vertical</proper"
+  "ty><child><object class=\"GtkScale\" id=\"brightness-level-on-ac\"><pro"
+  "perty name=\"visible\">True</property><property name=\"can_focus\">True"
+  "</property><property name=\"adjustment\">brightness-level-on-ac-adjustm"
+  "ent</property><property name=\"round_digits\">0</property><property nam"
+  "e=\"digits\">0</property><property name=\"draw_value\">False</property>"
+  "<signal name=\"value-changed\" handler=\"brightness_level_on_ac\" swapp"
+  "ed=\"no\"/><style><class name=\"xfce4-scale-label\"/></style></object><"
+  "packing><property name=\"expand\">False</property><property name=\"fill"
+  "\">True</property><property name=\"position\">0</property></packing></c"
+  "hild><child><object class=\"GtkLabel\" id=\"brightness-level-on-ac-labe"
+  "l\"><property name=\"visible\">True</property><property name=\"sensitiv"
+  "e\">False</property><property name=\"can_focus\">False</property><prope"
+  "rty name=\"xalign\">0.5</property></object><packing><property name=\"ex"
+  "pand\">False</property><property name=\"fill\">True</property><property"
+  " name=\"position\">1</property></packing></child></object><packing><pro"
+  "perty name=\"expand\">True</property><property name=\"fill\">True</prop"
+  "erty><property name=\"position\">1</property></packing></child></object"
+  "><packing><property name=\"expand\">True</property><property name=\"fil"
+  "l\">True</property><property name=\"position\">1</property></packing></"
+  "child></object><packing><property name=\"expand\">True</property><prope"
+  "rty name=\"fill\">True</property><property name=\"position\">0</propert"
+  "y></packing></child><child><object class=\"GtkBox\" id=\"hbox6\"><prope"
+  "rty name=\"visible\">True</property><property name=\"can_focus\">False<"
+  "/property><property name=\"valign\">center</property><property name=\"s"
+  "pacing\">6</property><property name=\"homogeneous\">True</property><chi"
+  "ld><object class=\"GtkBox\"><property name=\"visible\">True</property><"
+  "property name=\"can_focus\">False</property><property name=\"orientatio"
+  "n\">vertical</property><child><object class=\"GtkScale\" id=\"brightnes"
+  "s-inactivity-on-battery\"><property name=\"visible\">True</property><pr"
+  "operty name=\"can_focus\">True</property><property name=\"adjustment\">"
+  "brightness-inactivity-on-battery-adjustment</property><property name=\""
+  "round_digits\">0</property><property name=\"digits\">0</property><prope"
+  "rty name=\"draw_value\">False</property><signal name=\"value-changed\" "
+  "handler=\"brightness_on_battery_value_changed_cb\" swapped=\"no\"/><sty"
+  "le><class name=\"xfce4-scale-label\"/></style></object><packing><proper"
+  "ty name=\"expand\">False</property><property name=\"fill\">True</proper"
+  "ty><property name=\"position\">0</property></packing></child><child><ob"
+  "ject class=\"GtkLabel\" id=\"brightness-inactivity-on-battery-label\"><"
+  "property name=\"visible\">True</property><property name=\"sensitive\">F"
+  "alse</property><property name=\"can_focus\">False</property><property n"
+  "ame=\"xalign\">0.5</property></object><packing><property name=\"expand\""
+  ">False</property><property name=\"fill\">True</property><property name="
+  "\"position\">1</property></packing></child></object><packing><property "
+  "name=\"expand\">True</property><property name=\"fill\">True</property><"
+  "property name=\"position\">0</property></packing></child><child><object"
+  " class=\"GtkBox\"><property name=\"visible\">True</property><property n"
+  "ame=\"can_focus\">False</property><property name=\"orientation\">vertic"
+  "al</property><child><object class=\"GtkScale\" id=\"brightness-inactivi"
+  "ty-on-ac\"><property name=\"visible\">True</property><property name=\"c"
+  "an_focus\">True</property><property name=\"adjustment\">brightness-inac"
+  "tivity-on-ac-adjustment</property><property name=\"round_digits\">0</pr"
+  "operty><property name=\"digits\">0</property><property name=\"draw_valu"
+  "e\">False</property><signal name=\"value-changed\" handler=\"brightness"
+  "_on_ac_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-sc"
+  "ale-label\"/></style></object><packing><property name=\"expand\">False<"
+  "/property><property name=\"fill\">True</property><property name=\"posit"
+  "ion\">0</property></packing></child><child><object class=\"GtkLabel\" i"
+  "d=\"brightness-inactivity-on-ac-label\"><property name=\"visible\">True"
+  "</property><property name=\"sensitive\">False</property><property name="
+  "\"can_focus\">False</property><property name=\"xalign\">0.5</property><"
   "/object><packing><property name=\"expand\">False</property><property na"
-  "me=\"fill\">True</property><property name=\"position\">0</property></pa"
-  "cking></child><child><object class=\"GtkFrame\" id=\"brightness-frame\""
-  "><property name=\"visible\">True</property><property name=\"can_focus\""
-  ">False</property><property name=\"label_xalign\">0</property><property "
-  "name=\"shadow_type\">none</property><child><object class=\"GtkBox\" id="
-  "\"vbox5\"><property name=\"visible\">True</property><property name=\"ca"
-  "n_focus\">False</property><property name=\"orientation\">vertical</prop"
-  "erty><property name=\"margin_bottom\">12</property><property name=\"mar"
-  "gin_start\">18</property><child><object class=\"GtkBox\" id=\"hbox1\"><"
-  "property name=\"visible\">True</property><property name=\"can_focus\">F"
-  "alse</property><property name=\"spacing\">6</property><child><object cl"
-  "ass=\"GtkBox\" id=\"vbox12\"><property name=\"visible\">True</property>"
-  "<property name=\"can_focus\">False</property><property name=\"orientati"
-  "on\">vertical</property><property name=\"homogeneous\">True</property><"
-  "child><object class=\"GtkLabel\" id=\"brightness-level-label\"><propert"
-  "y name=\"visible\">True</property><property name=\"can_focus\">False</p"
-  "roperty><property name=\"xalign\">0</property><property name=\"label\" "
-  "translatable=\"yes\">On inactivity reduce to</property></object><packin"
-  "g><property name=\"expand\">True</property><property name=\"fill\">True"
-  "</property><property name=\"position\">0</property></packing></child><c"
-  "hild><object class=\"GtkLabel\" id=\"brightness-inactivity-label\"><pro"
-  "perty name=\"visible\">True</property><property name=\"can_focus\">Fals"
-  "e</property><property name=\"xalign\">0</property><property name=\"labe"
-  "l\" translatable=\"yes\">Reduce after</property></object><packing><prop"
-  "erty name=\"expand\">True</property><property name=\"fill\">True</prope"
-  "rty><property name=\"position\">1</property></packing></child></object>"
-  "<packing><property name=\"expand\">False</property><property name=\"fil"
-  "l\">True</property><property name=\"position\">0</property></packing></"
-  "child><child><object class=\"GtkBox\" id=\"vbox15\"><property name=\"vi"
-  "sible\">True</property><property name=\"can_focus\">False</property><pr"
-  "operty name=\"orientation\">vertical</property><property name=\"homogen"
-  "eous\">True</property><child><object class=\"GtkBox\" id=\"hbox5\"><pro"
-  "perty name=\"visible\">True</property><property name=\"can_focus\">Fals"
-  "e</property><property name=\"spacing\">6</property><property name=\"hom"
-  "ogeneous\">True</property><property name=\"valign\">center</property><c"
-  "hild><object class=\"GtkBox\" id=\"vbox18\"><property name=\"visible\">"
-  "True</property><property name=\"can_focus\">False</property><property n"
-  "ame=\"orientation\">vertical</property><child><object class=\"GtkLabel\""
-  " id=\"brightness-on-battery-header\"><property name=\"visible\">True</p"
-  "roperty><property name=\"can_focus\">False</property><property name=\"y"
-  "align\">1</property><property name=\"label\" translatable=\"yes\">On ba"
-  "ttery</property><property name=\"use_markup\">True</property></object><"
-  "packing><property name=\"expand\">True</property><property name=\"fill\""
-  ">True</property><property name=\"position\">0</property></packing></chi"
-  "ld><child><object class=\"GtkBox\"><property name=\"visible\">True</pro"
-  "perty><property name=\"can_focus\">False</property><property name=\"ori"
-  "entation\">vertical</property><child><object class=\"GtkScale\" id=\"br"
-  "ightness-level-on-battery\"><property name=\"visible\">True</property><"
-  "property name=\"can_focus\">True</property><property name=\"adjustment\""
-  ">brightness-level-on-battery-adjustment</property><property name=\"roun"
-  "d_digits\">0</property><property name=\"digits\">0</property><property "
-  "name=\"draw-value\">False</property><signal name=\"value-changed\" hand"
-  "ler=\"brightness_level_on_battery\" swapped=\"no\"/><style><class name="
-  "\"xfce4-scale-label\"/></style></object></child><child><object class=\""
-  "GtkLabel\" id=\"brightness-level-on-battery-label\"><property name=\"vi"
-  "sible\">True</property><property name=\"can_focus\">False</property><pr"
-  "operty name=\"sensitive\">False</property><property name=\"xalign\">0.5"
-  "</property></object></child></object><packing><property name=\"expand\""
+  "me=\"fill\">True</property><property name=\"position\">1</property></pa"
+  "cking></child></object><packing><property name=\"expand\">True</propert"
+  "y><property name=\"fill\">True</property><property name=\"position\">1<"
+  "/property></packing></child></object><packing><property name=\"expand\""
   ">True</property><property name=\"fill\">True</property><property name=\""
   "position\">1</property></packing></child></object><packing><property na"
   "me=\"expand\">True</property><property name=\"fill\">True</property><pr"
-  "operty name=\"position\">0</property></packing></child><child><object c"
-  "lass=\"GtkBox\" id=\"vbox19\"><property name=\"visible\">True</property"
-  "><property name=\"can_focus\">False</property><property name=\"orientat"
-  "ion\">vertical</property><child><object class=\"GtkLabel\" id=\"brightn"
-  "ess-plugged-in-header\"><property name=\"visible\">True</property><prop"
-  "erty name=\"can_focus\">False</property><property name=\"yalign\">1</pr"
-  "operty><property name=\"label\" translatable=\"yes\">Plugged in</proper"
-  "ty><property name=\"use_markup\">True</property></object><packing><prop"
-  "erty name=\"expand\">True</property><property name=\"fill\">True</prope"
-  "rty><property name=\"position\">0</property></packing></child><child><o"
-  "bject class=\"GtkBox\"><property name=\"visible\">True</property><prope"
-  "rty name=\"can_focus\">False</property><property name=\"orientation\">v"
-  "ertical</property><child><object class=\"GtkScale\" id=\"brightness-lev"
-  "el-on-ac\"><property name=\"visible\">True</property><property name=\"c"
-  "an_focus\">True</property><property name=\"adjustment\">brightness-leve"
-  "l-on-ac-adjustment</property><property name=\"round_digits\">0</propert"
-  "y><property name=\"digits\">0</property><property name=\"draw-value\">F"
-  "alse</property><signal name=\"value-changed\" handler=\"brightness_leve"
-  "l_on_ac\" swapped=\"no\"/><style><class name=\"xfce4-scale-label\"/></s"
-  "tyle></object></child><child><object class=\"GtkLabel\" id=\"brightness"
-  "-level-on-ac-label\"><property name=\"visible\">True</property><propert"
-  "y name=\"can_focus\">False</property><property name=\"sensitive\">False"
-  "</property><property name=\"xalign\">0.5</property></object></child></o"
-  "bject><packing><property name=\"expand\">True</property><property name="
-  "\"fill\">True</property><property name=\"position\">1</property></packi"
-  "ng></child></object><packing><property name=\"expand\">True</property><"
-  "property name=\"fill\">True</property><property name=\"position\">1</pr"
-  "operty></packing></child></object><packing><property name=\"expand\">Tr"
-  "ue</property><property name=\"fill\">True</property><property name=\"po"
-  "sition\">0</property></packing></child><child><object class=\"GtkBox\" "
-  "id=\"hbox6\"><property name=\"visible\">True</property><property name=\""
-  "can_focus\">False</property><property name=\"spacing\">6</property><pro"
-  "perty name=\"homogeneous\">True</property><property name=\"valign\">cen"
-  "ter</property><child><object class=\"GtkBox\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"orientation\">vertical</property><child><object class=\"GtkScale"
-  "\" id=\"brightness-inactivity-on-battery\"><property name=\"visible\">T"
-  "rue</property><property name=\"can_focus\">True</property><property nam"
-  "e=\"adjustment\">brightness-inactivity-on-battery-adjustment</property>"
-  "<property name=\"round_digits\">0</property><property name=\"digits\">0"
-  "</property><property name=\"draw-value\">False</property><signal name=\""
-  "value-changed\" handler=\"brightness_on_battery_value_changed_cb\" swap"
-  "ped=\"no\"/><style><class name=\"xfce4-scale-label\"/></style></object>"
-  "</child><child><object class=\"GtkLabel\" id=\"brightness-inactivity-on"
-  "-battery-label\"><property name=\"visible\">True</property><property na"
-  "me=\"can_focus\">False</property><property name=\"sensitive\">False</pr"
-  "operty><property name=\"xalign\">0.5</property></object></child></objec"
-  "t><packing><property name=\"expand\">True</property><property name=\"fi"
-  "ll\">True</property><property name=\"position\">0</property></packing><"
-  "/child><child><object class=\"GtkBox\"><property name=\"visible\">True<"
-  "/property><property name=\"can_focus\">False</property><property name=\""
-  "orientation\">vertical</property><child><object class=\"GtkScale\" id=\""
-  "brightness-inactivity-on-ac\"><property name=\"visible\">True</property"
-  "><property name=\"can_focus\">True</property><property name=\"adjustmen"
-  "t\">brightness-inactivity-on-ac-adjustment</property><property name=\"r"
-  "ound_digits\">0</property><property name=\"digits\">0</property><proper"
-  "ty name=\"draw-value\">False</property><signal name=\"value-changed\" h"
-  "andler=\"brightness_on_ac_value_changed_cb\" swapped=\"no\"/><style><cl"
-  "ass name=\"xfce4-scale-label\"/></style></object></child><child><object"
-  " class=\"GtkLabel\" id=\"brightness-inactivity-on-ac-label\"><property "
-  "name=\"visible\">True</property><property name=\"can_focus\">False</pro"
-  "perty><property name=\"sensitive\">False</property><property name=\"xal"
-  "ign\">0.5</property></object></child></object><packing><property name=\""
-  "expand\">True</property><property name=\"fill\">True</property><propert"
-  "y name=\"position\">1</property></packing></child></object><packing><pr"
-  "operty name=\"expand\">True</property><property name=\"fill\">True</pro"
-  "perty><property name=\"position\">1</property></packing></child></objec"
-  "t><packing><property name=\"expand\">True</property><property name=\"fi"
-  "ll\">True</property><property name=\"position\">1</property></packing><"
-  "/child></object><packing><property name=\"expand\">True</property><prop"
-  "erty name=\"fill\">True</property><property name=\"position\">0</proper"
-  "ty></packing></child></object></child><child type=\"label\"><object cla"
-  "ss=\"GtkLabel\" id=\"label4\"><property name=\"visible\">True</property"
-  "><property name=\"can_focus\">False</property><property name=\"label\" "
-  "translatable=\"yes\">&lt;b&gt;Brightness reduction&lt;/b&gt;</property>"
-  "<property name=\"use_markup\">True</property></object></child></object>"
-  "<packing><property name=\"expand\">False</property><property name=\"fil"
-  "l\">True</property><property name=\"position\">2</property></packing></"
-  "child></object><packing><property name=\"position\">2</property></packi"
-  "ng></child><child type=\"tab\"><object class=\"GtkLabel\" id=\"display\""
-  "><property name=\"visible\">True</property><property name=\"can_focus\""
-  ">False</property><property name=\"label\" translatable=\"yes\">Display<"
-  "/property></object><packing><property name=\"position\">2</property><pr"
-  "operty name=\"tab_fill\">False</property></packing></child><child><obje"
-  "ct class=\"GtkBox\" id=\"light-locker-vbox1\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"border_width\">12</property><property name=\"orientation\">verti"
-  "cal</property><property name=\"spacing\">6</property><child><object cla"
-  "ss=\"GtkFrame\" id=\"light-locker-frame\"><property name=\"visible\">Tr"
+  "operty name=\"position\">1</property></packing></child></object><packin"
+  "g><property name=\"expand\">True</property><property name=\"fill\">True"
+  "</property><property name=\"position\">0</property></packing></child></"
+  "object></child><child type=\"label\"><object class=\"GtkLabel\" id=\"la"
+  "bel4\"><property name=\"visible\">True</property><property name=\"can_f"
+  "ocus\">False</property><property name=\"label\" translatable=\"yes\">&l"
+  "t;b&gt;Brightness reduction&lt;/b&gt;</property><property name=\"use_ma"
+  "rkup\">True</property></object></child></object><packing><property name"
+  "=\"expand\">False</property><property name=\"fill\">True</property><pro"
+  "perty name=\"position\">2</property></packing></child></object><packing"
+  "><property name=\"position\">2</property></packing></child><child type="
+  "\"tab\"><object class=\"GtkLabel\" id=\"display\"><property name=\"visi"
+  "ble\">True</property><property name=\"can_focus\">False</property><prop"
+  "erty name=\"label\" translatable=\"yes\">Display</property></object><pa"
+  "cking><property name=\"position\">2</property><property name=\"tab_fill"
+  "\">False</property></packing></child><child><object class=\"GtkBox\" id"
+  "=\"light-locker-vbox1\"><property name=\"visible\">True</property><prop"
+  "erty name=\"can_focus\">False</property><property name=\"border_width\""
+  ">12</property><property name=\"orientation\">vertical</property><proper"
+  "ty name=\"spacing\">6</property><child><object class=\"GtkFrame\" id=\""
+  "light-locker-frame\"><property name=\"visible\">True</property><propert"
+  "y name=\"can_focus\">False</property><property name=\"label_xalign\">0<"
+  "/property><property name=\"shadow_type\">none</property><child><object "
+  "class=\"GtkBox\" id=\"light-locker-vbox2\"><property name=\"visible\">T"
+  "rue</property><property name=\"can_focus\">False</property><property na"
+  "me=\"margin_start\">18</property><property name=\"margin_top\">6</prope"
+  "rty><property name=\"margin_bottom\">18</property><property name=\"orie"
+  "ntation\">vertical</property><property name=\"spacing\">5</property><ch"
+  "ild><object class=\"GtkGrid\" id=\"light-locker-table\"><property name="
+  "\"visible\">True</property><property name=\"can_focus\">False</property"
+  "><property name=\"row_spacing\">6</property><property name=\"column_spa"
+  "cing\">6</property><child><object class=\"GtkLabel\" id=\"light-locker-"
+  "automatic-locking-label\"><property name=\"visible\">True</property><pr"
+  "operty name=\"can_focus\">False</property><property name=\"label\" tran"
+  "slatable=\"yes\">Automatically lock the session:</property><property na"
+  "me=\"xalign\">0</property></object><packing><property name=\"left_attac"
+  "h\">0</property><property name=\"top_attach\">0</property></packing></c"
+  "hild><child><object class=\"GtkComboBox\" id=\"light-locker-automatic-l"
+  "ocking-combo\"><property name=\"visible\">True</property><property name"
+  "=\"can_focus\">False</property><property name=\"model\">liststore1</pro"
+  "perty><property name=\"active\">0</property><signal name=\"changed\" ha"
+  "ndler=\"light_locker_automatic_locking_changed_cb\" swapped=\"no\"/><ch"
+  "ild><object class=\"GtkCellRendererText\" id=\"renderer11\"/><attribute"
+  "s><attribute name=\"text\">1</attribute></attributes></child></object><"
+  "packing><property name=\"left_attach\">1</property><property name=\"top"
+  "_attach\">0</property></packing></child><child><object class=\"GtkLabel"
+  "\" id=\"light-locker-late-locking-label\"><property name=\"visible\">Tr"
   "ue</property><property name=\"can_focus\">False</property><property nam"
-  "e=\"label_xalign\">0</property><property name=\"shadow_type\">none</pro"
-  "perty><child><object class=\"GtkBox\" id=\"light-locker-vbox2\"><proper"
-  "ty name=\"visible\">True</property><property name=\"can_focus\">False</"
-  "property><property name=\"orientation\">vertical</property><property na"
-  "me=\"margin_top\">6</property><property name=\"margin_bottom\">18</prop"
-  "erty><property name=\"margin_start\">18</property><property name=\"spac"
-  "ing\">5</property><child><object class=\"GtkGrid\" id=\"light-locker-ta"
-  "ble\"><property name=\"visible\">True</property><property name=\"can_fo"
-  "cus\">False</property><property name=\"row_spacing\">6</property><prope"
-  "rty name=\"column_spacing\">6</property><child><object class=\"GtkLabel"
-  "\" id=\"light-locker-automatic-locking-label\"><property name=\"visible"
-  "\">True</property><property name=\"can_focus\">False</property><propert"
-  "y name=\"xalign\">0</property><property name=\"label\" translatable=\"y"
-  "es\">Automatically lock the session:</property></object><packing><prope"
-  "rty name=\"left_attach\">0</property><property name=\"top_attach\">0</p"
-  "roperty></packing></child><child><object class=\"GtkComboBox\" id=\"lig"
-  "ht-locker-automatic-locking-combo\"><property name=\"visible\">True</pr"
-  "operty><property name=\"can_focus\">False</property><property name=\"mo"
-  "del\">liststore1</property><property name=\"active\">0</property><signa"
-  "l name=\"changed\" handler=\"light_locker_automatic_locking_changed_cb\""
-  " swapped=\"no\"/><child><object class=\"GtkCellRendererText\" id=\"rend"
-  "erer11\"/><attributes><attribute name=\"text\">1</attribute></attribute"
-  "s></child></object><packing><property name=\"left_attach\">1</property>"
-  "<property name=\"top_attach\">0</property></packing></child><child><obj"
-  "ect class=\"GtkLabel\" id=\"light-locker-late-locking-label\"><property"
-  " name=\"visible\">True</property><property name=\"can_focus\">False</pr"
-  "operty><property name=\"xalign\">0</property><property name=\"label\" t"
-  "ranslatable=\"yes\">Delay locking after screensaver for</property></obj"
-  "ect><packing><property name=\"left_attach\">0</property><property name="
-  "\"top_attach\">1</property></packing></child><child><object class=\"Gtk"
-  "Box\"><property name=\"visible\">True</property><property name=\"can_fo"
-  "cus\">False</property><property name=\"orientation\">vertical</property"
-  "><child><object class=\"GtkScale\" id=\"light-locker-late-locking-scale"
-  "\"><property name=\"visible\">True</property><property name=\"can_focus"
-  "\">True</property><property name=\"adjustment\">light-locker-late-locki"
-  "ng-adjustment</property><property name=\"round_digits\">0</property><pr"
-  "operty name=\"digits\">0</property><property name=\"draw-value\">False<"
-  "/property><signal name=\"value-changed\" handler=\"light_locker_late_lo"
-  "cking_value_changed_cb\" swapped=\"no\"/><style><class name=\"xfce4-sca"
-  "le-label\"/></style></object></child><child><object class=\"GtkLabel\" "
-  "id=\"light-locker-late-locking-scale-label\"><property name=\"visible\""
-  ">True</property><property name=\"can_focus\">False</property><property "
-  "name=\"sensitive\">False</property><property name=\"xalign\">0.5</prope"
-  "rty></object></child></object><packing><property name=\"left_attach\">1"
-  "</property><property name=\"top_attach\">1</property></packing></child>"
-  "<child><object class=\"GtkCheckButton\" id=\"light-locker-suspend\"><pr"
-  "operty name=\"label\" translatable=\"yes\">Lock screen when system is g"
-  "oing to sleep</property><property name=\"visible\">True</property><prop"
-  "erty name=\"can_focus\">True</property><property name=\"receives_defaul"
-  "t\">False</property><property name=\"draw_indicator\">True</property><s"
-  "ignal name=\"toggled\" handler=\"lock_screen_toggled_cb\" swapped=\"no\""
-  "/></object><packing><property name=\"left_attach\">0</property><propert"
-  "y name=\"top_attach\">2</property></packing></child><child><placeholder"
-  "/></child></object><packing><property name=\"expand\">False</property><"
-  "property name=\"fill\">True</property><property name=\"position\">0</pr"
-  "operty></packing></child></object></child><child type=\"label\"><object"
-  " class=\"GtkLabel\" id=\"light-locker-frame-label\"><property name=\"vi"
-  "sible\">True</property><property name=\"can_focus\">False</property><pr"
-  "operty name=\"label\" translatable=\"yes\">&lt;b&gt;Light Locker&lt;/b&"
-  "gt;</property><property name=\"use_markup\">True</property></object></c"
-  "hild></object><packing><property name=\"expand\">False</property><prope"
-  "rty name=\"fill\">True</property><property name=\"position\">0</propert"
-  "y></packing></child></object><packing><property name=\"position\">3</pr"
-  "operty></packing></child><child type=\"tab\"><object class=\"GtkLabel\""
-  " id=\"light-locker-tab-label\"><property name=\"visible\">True</propert"
-  "y><property name=\"can_focus\">False</property><property name=\"label\""
-  " translatable=\"yes\">Security</property></object><packing><property na"
-  "me=\"position\">2</property><property name=\"tab_fill\">False</property"
-  "></packing></child></object><packing><property name=\"expand\">True</pr"
-  "operty><property name=\"fill\">True</property><property name=\"position"
-  "\">0</property></packing></child></object><packing><property name=\"exp"
-  "and\">True</property><property name=\"fill\">True</property><property n"
-  "ame=\"position\">1</property></packing></child></object></child><action"
-  "-widgets><action-widget response=\"-11\">help-button</action-widget><ac"
-  "tion-widget response=\"-3\">close-button</action-widget></action-widget"
-  "s></object><object class=\"GtkSizeGroup\" id=\"sg-critical-power\"><wid"
-  "gets><widget name=\"critical-power-level-label\"/><widget name=\"critic"
-  "al-power-action-label\"/></widgets></object><object class=\"GtkSizeGrou"
-  "p\" id=\"sg-display-labels\"><widgets><widget name=\"display-blank-labe"
-  "l\"/><widget name=\"dpms-sleep-label\"/><widget name=\"dpms-off-label\""
-  "/><widget name=\"brightness-level-label\"/><widget name=\"brightness-in"
-  "activity-label\"/></widgets></object><object class=\"GtkSizeGroup\" id="
-  "\"sg-display-sliders\"><widgets><widget name=\"dpms-on-battery-header\""
-  "/><widget name=\"dpms-plugged-in-header\"/><widget name=\"brightness-on"
-  "-battery-header\"/><widget name=\"brightness-plugged-in-header\"/></wid"
-  "gets></object></interface>"
+  "e=\"label\" translatable=\"yes\">Delay locking after screensaver for</p"
+  "roperty><property name=\"xalign\">0</property></object><packing><proper"
+  "ty name=\"left_attach\">0</property><property name=\"top_attach\">1</pr"
+  "operty></packing></child><child><object class=\"GtkBox\"><property name"
+  "=\"visible\">True</property><property name=\"can_focus\">False</propert"
+  "y><property name=\"orientation\">vertical</property><child><object clas"
+  "s=\"GtkScale\" id=\"light-locker-late-locking-scale\"><property name=\""
+  "visible\">True</property><property name=\"can_focus\">True</property><p"
+  "roperty name=\"adjustment\">light-locker-late-locking-adjustment</prope"
+  "rty><property name=\"round_digits\">0</property><property name=\"digits"
+  "\">0</property><property name=\"draw_value\">False</property><signal na"
+  "me=\"value-changed\" handler=\"light_locker_late_locking_value_changed_"
+  "cb\" swapped=\"no\"/><style><class name=\"xfce4-scale-label\"/></style>"
+  "</object><packing><property name=\"expand\">False</property><property n"
+  "ame=\"fill\">True</property><property name=\"position\">0</property></p"
+  "acking></child><child><object class=\"GtkLabel\" id=\"light-locker-late"
+  "-locking-scale-label\"><property name=\"visible\">True</property><prope"
+  "rty name=\"sensitive\">False</property><property name=\"can_focus\">Fal"
+  "se</property><property name=\"xalign\">0.5</property></object><packing>"
+  "<property name=\"expand\">False</property><property name=\"fill\">True<"
+  "/property><property name=\"position\">1</property></packing></child></o"
+  "bject><packing><property name=\"left_attach\">1</property><property nam"
+  "e=\"top_attach\">1</property></packing></child><child><object class=\"G"
+  "tkCheckButton\" id=\"light-locker-suspend\"><property name=\"label\" tr"
+  "anslatable=\"yes\">Lock screen when system is going to sleep</property>"
+  "<property name=\"visible\">True</property><property name=\"can_focus\">"
+  "True</property><property name=\"receives_default\">False</property><pro"
+  "perty name=\"draw_indicator\">True</property><signal name=\"toggled\" h"
+  "andler=\"lock_screen_toggled_cb\" swapped=\"no\"/></object><packing><pr"
+  "operty name=\"left_attach\">0</property><property name=\"top_attach\">2"
+  "</property></packing></child><child><placeholder/></child></object><pac"
+  "king><property name=\"expand\">False</property><property name=\"fill\">"
+  "True</property><property name=\"position\">0</property></packing></chil"
+  "d></object></child><child type=\"label\"><object class=\"GtkLabel\" id="
+  "\"light-locker-frame-label\"><property name=\"visible\">True</property>"
+  "<property name=\"can_focus\">False</property><property name=\"label\" t"
+  "ranslatable=\"yes\">&lt;b&gt;Light Locker&lt;/b&gt;</property><property"
+  " name=\"use_markup\">True</property></object></child></object><packing>"
+  "<property name=\"expand\">False</property><property name=\"fill\">True<"
+  "/property><property name=\"position\">0</property></packing></child></o"
+  "bject><packing><property name=\"position\">3</property></packing></chil"
+  "d><child type=\"tab\"><object class=\"GtkLabel\" id=\"light-locker-tab-"
+  "label\"><property name=\"visible\">True</property><property name=\"can_"
+  "focus\">False</property><property name=\"label\" translatable=\"yes\">S"
+  "ecurity</property></object><packing><property name=\"position\">2</prop"
+  "erty><property name=\"tab_fill\">False</property></packing></child></ob"
+  "ject><packing><property name=\"expand\">True</property><property name=\""
+  "fill\">True</property><property name=\"position\">0</property></packing"
+  "></child></object><packing><property name=\"expand\">True</property><pr"
+  "operty name=\"fill\">True</property><property name=\"position\">1</prop"
+  "erty></packing></child></object></child><action-widgets><action-widget "
+  "response=\"-11\">help-button</action-widget><action-widget response=\"-"
+  "3\">close-button</action-widget></action-widgets></object><object class"
+  "=\"GtkSizeGroup\" id=\"sg-critical-power\"><widgets><widget name=\"crit"
+  "ical-power-level-label\"/><widget name=\"critical-power-action-label\"/"
+  "></widgets></object><object class=\"GtkSizeGroup\" id=\"sg-display-labe"
+  "ls\"><widgets><widget name=\"display-blank-label\"/><widget name=\"dpms"
+  "-sleep-label\"/><widget name=\"dpms-off-label\"/><widget name=\"brightn"
+  "ess-level-label\"/><widget name=\"brightness-inactivity-label\"/></widg"
+  "ets></object><object class=\"GtkSizeGroup\" id=\"sg-display-sliders\"><"
+  "widgets><widget name=\"dpms-on-battery-header\"/><widget name=\"dpms-pl"
+  "ugged-in-header\"/><widget name=\"brightness-on-battery-header\"/><widg"
+  "et name=\"brightness-plugged-in-header\"/></widgets></object></interfac"
+  "e>"
 };
 
-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 <corsac@debian.org>  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 <corsac@debian.org>  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 <corsac@debian.org>  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 <corsac@debian.org>  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 <debian-xfce@lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>
-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 <gord@gnu.ai.mit.edu>, 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
-# <https://opensource.org/license/MIT>, and GPL version 3 or later
-# <http://www.gnu.org/licenses/gpl-2.0.html>.  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 <http://www.gnu.org/licenses/>.
 
-# Please report bugs or propose patches to:
-# <https://github.com/gnulib-modules/bootstrap/issues>
+# 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
-# <https://opensource.org/license/MIT>, and GPL version 3 or later
-# <http://www.gnu.org/licenses/gpl-2.0.html>.  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:
-# <https://github.com/gnulib-modules/bootstrap/issues>
+# 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 <http://www.gnu.org/licenses/>.
+
+# 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 '<hooked_function_name>_result', escaped
-# suitably for 'eval'.
-#
-# The '<hooked_function_name>_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 '<hooked_function_name>_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
+# '<hooked_function_name>_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);