Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez · Yves-Alexis Perez
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,4 +6,4 @@ Rickard E. Faith <faith@acm.org>
 Noberasco Michele <2001s098@educ.disi.unige.it>
 Nick Schermer <nick@xfce.org>
 Florian Rivoal <frivoal@xfce.org>
-Andre Miranda <andre42m@gmail.com>
+Andre Miranda <andreldm@xfce.org>
--- a/ChangeLog
+++ b/ChangeLog
+commit 6f3bba6a0fe53eca2a160238ebc7bff3339cce28
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sun Jan 13 13:21:07 2019 -0300
+
+    Updates for release
+
+commit 98115c79a92282df9a18f2beb82d286a21665d80
+Author: Pavel Borecki <pavel.borecki@gmail.com>
+Date:   Fri Jan 11 12:34:12 2019 +0100
+
+    I18n: Update translation cs (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit bc0dc7b3722fa99ecd5f3c0c6e55e3535c8a0d0d
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date:   Fri Jan 11 00:31:29 2019 +0100
+
+    I18n: Update translation ja (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 12edacb38a6cc6d9e277f2b2d79be26749f40842
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Sun Jan 6 18:32:34 2019 +0100
+
+    I18n: Update translation fr (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit a1758ab20ee1116aeff13ee4f83c51fb7b5c587e
+Author: Theppitak Karoonboonyanan <theppitak@gmail.com>
+Date:   Sat Jan 5 12:31:17 2019 +0100
+
+    I18n: Update translation th (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 6e0466dfd3470aeadd0982387040beefd581831b
+Author: Christos Arvanitis <arvchristos@gmail.com>
+Date:   Fri Jan 4 18:32:33 2019 +0100
+
+    I18n: Update translation el (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 97d3e09bdd1324be1bd0e55ff6d63550512ecf26
+Author: Elishai Eliyahu <e1907@mm.st>
+Date:   Fri Jan 4 12:31:50 2019 +0100
+
+    I18n: Update translation he (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 5afb9301a7a71e723e682cf2544dfdc721bb2e99
+Author: Igor <f2404@yandex.ru>
+Date:   Fri Jan 4 00:31:19 2019 +0100
+
+    I18n: Update translation ru (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 304667835115e40ae7bbe9572e12a1f85288f754
+Author: Zmicer Turok <zmicerturok@gmail.com>
+Date:   Thu Jan 3 18:32:30 2019 +0100
+
+    I18n: Update translation be (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit e51f5d67612409c7ec1083c65e6fbe097ab0f04b
+Author: Pjotr <pjotrvertaalt@gmail.com>
+Date:   Wed Jan 2 18:31:18 2019 +0100
+
+    I18n: Update translation nl (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit bf1eca295a93e7a1e18bdb03c2e7ca3c0b0430b9
+Author: Demiray Muhterem <mdemiray@msn.com>
+Date:   Wed Jan 2 12:31:16 2019 +0100
+
+    I18n: Update translation tr (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 7e838c767ea4aed2333661aba0593bfad5a383b9
+Author: Jeff Huang <s8321414@gmail.com>
+Date:   Wed Jan 2 06:31:25 2019 +0100
+
+    I18n: Update translation zh_TW (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 7966e1604c21089c420d61486d2b10f657511c6e
+Author: 玉堂白鹤 <yjwork@qq.com>
+Date:   Wed Jan 2 06:31:25 2019 +0100
+
+    I18n: Update translation zh_CN (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit ee4d77147b6919aed42a12d47dee457a746c5ca4
+Author: Edin Veskovic <edin.lockedin@gmail.com>
+Date:   Wed Jan 2 00:32:44 2019 +0100
+
+    I18n: Update translation hr (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit b63c351bd0d882841ae0e705ee91b8f14f4f3309
+Author: Besnik <besnik@programeshqip.org>
+Date:   Tue Jan 1 18:31:23 2019 +0100
+
+    I18n: Update translation sq (88%).
+    
+    37 translated messages, 5 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit a2241d7db66d28a426387fa46cd028ad68c081a1
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Jan 1 18:31:23 2019 +0100
+
+    I18n: Update translation lt (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2942e4a379681a8bf7ac3cb899eecabb1f8e647f
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Jan 1 18:31:23 2019 +0100
+
+    I18n: Update translation da (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 663bcbeffcd2f537e2210f53b271f432a8728a2f
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Tue Jan 1 18:31:23 2019 +0100
+
+    I18n: Update translation cs (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 2eb948ebf69d92dfd8a2cf19efe3b660245f94aa
+Author: Besnik <besnik@programeshqip.org>
+Date:   Tue Jan 1 12:31:17 2019 +0100
+
+    I18n: Update translation sq (83%).
+    
+    35 translated messages, 7 untranslated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 12012c629e13e5a37a8129e526d558cc44982f95
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Jan 1 12:31:17 2019 +0100
+
+    I18n: Update translation pl (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 5a0537c1872e3f7a3697d948e4e607f4775c0bba
+Author: Emanuele Petriglia <inbox@emanuelepetriglia.me>
+Date:   Tue Jan 1 12:31:17 2019 +0100
+
+    I18n: Update translation it (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 770d4234c0485ec3439b99b6160302785dca5d52
+Author: Andreas Eitel <github-aneitel@online.de>
+Date:   Tue Jan 1 12:31:17 2019 +0100
+
+    I18n: Update translation de (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 7fe416d65150f7da37dc785cf70b7240fa2fca77
+Author: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+Date:   Tue Jan 1 12:31:17 2019 +0100
+
+    I18n: Update translation ca (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 56e5003093fc2c68b47252db9cd5c1c95e8b8534
+Author: Kiril Kirilov <cybercop_montana@abv.bg>
+Date:   Tue Jan 1 12:31:17 2019 +0100
+
+    I18n: Update translation bg (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 6fca549e0dec8f7296459eb1d8ba10ba55459da5
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 19:14:59 2018 -0300
+
+    Replace debug printf calls with DBG macro
+
+commit 60b5a2f479b575bbd0d360f78550cf30e693ee4a
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 19:13:05 2018 -0300
+
+    Update copyright
+
+commit 1b039a945dc943e1cf357e47b196e2f4f199ac87
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 19:03:27 2018 -0300
+
+    Source format
+
+commit bc4f896ef82d9313325c1f43fa100b3626922fed
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 18:30:22 2018 -0300
+
+    Update my e-mail and copyright year
+
+commit b32c015ed36c0f6e9e053351482303a15615847a
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 18:15:52 2018 -0300
+
+    Fix possible memory leak
+
+commit 7faffa174b19232e7594633894bfafac0539f287
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 18:15:41 2018 -0300
+
+    Fix compilation warnings
+
+commit b0249556bf2e3ce8cfc19a82d1173c6157fa6c78
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 17:55:08 2018 -0300
+
+    Fix compile error when debug is enabled
+
+commit c4fcb68f178f6f5528cf5d8b1829dce1a13cf811
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Mon Dec 31 17:54:40 2018 -0300
+
+    Fix XDT_CHECK_PACKAGE usage, gio is not optional
+
+commit 205a18e99c554529b282b3f30e1cd8e40a5efa55
+Author: Alexander Butenko <a.butenka@gmail.com>
+Date:   Sun Dec 16 10:03:55 2018 -0400
+
+    Listen for UPower events for power source changes (Bug #14978)
+
+commit 2417d8ef81c5b7f2d519a90f1a1c67a0a8138047
+Author: John Lindgren <john@jlindgren.net>
+Date:   Sat Dec 1 00:47:23 2018 -0500
+
+    Reset averages when a battery is removed/added (Bug #14930).
+
+commit 77a9b19d49c3fd4d81d52d9e2b3c5aab51d75fb3
+Author: John Lindgren <john@jlindgren.net>
+Date:   Sat Dec 1 00:31:07 2018 -0500
+
+    Re-detect battery presence every 30 seconds (Bug #14930).
+
+commit c3a8821f9d34d8df8c24610afe599847bc97a788
+Author: John Lindgren <john@jlindgren.net>
+Date:   Fri Nov 30 23:41:41 2018 -0500
+
+    Fix null pointer dereference with no battery present (Bug #14930).
+
+commit 9d0c905d3af56e55a589cb057766ba4164620151
+Author: John Lindgren <john@jlindgren.net>
+Date:   Fri Nov 30 23:21:08 2018 -0500
+
+    Linux: Allow normal startup if either AC adapter or battery is found.
+
+commit 023a0343b214385cc884471ea90bdee1f390d0c0
+Author: John Lindgren <john@jlindgren.net>
+Date:   Fri Nov 30 22:47:10 2018 -0500
+
+    Remove deprecated /proc/acpi support in favor of sysfs.
+
+commit 86dd9360281223b6d21a4a06963a66b4dd640add
+Author: John Lindgren <john@jlindgren.net>
+Date:   Fri Nov 30 22:15:35 2018 -0500
+
+    Remove APM support on FreeBSD as well, it doesn't even build.
+
+commit ae36fc8b03183ae05cfad634583cc05f091e400f
+Author: John Lindgren <john@jlindgren.net>
+Date:   Fri Nov 30 21:35:48 2018 -0500
+
+    Remove historical APM support for Linux, support ACPI only.
+
+commit 434e724e10b82b91c52a93c89379d71dc3464cf1
+Author: Landry Breuil <landry@xfce.org>
+Date:   Thu Nov 29 18:18:40 2018 +0100
+
+    use dashes to show that we have no value instead of showing wrong bogus values (#9594)
+
+commit 93de5176fe7d159d6060b6839358c3df6abfaa00
+Author: John Lindgren <john@jlindgren.net>
+Date:   Sun Nov 25 21:09:47 2018 -0500
+
+    Initially show/hide widgets according to user config (bug #9594)
+    
+    - Move setup_battmon() after battmon_read_config()
+    - Move gtk_widget_hide() after gtk_widget_show_all()
+    - Remove redundant gtk_widget_show()
+
+commit 895ec3b74b4be97159a516ef576a955bfb2ebd7f
+Author: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+Date:   Tue Oct 23 00:32:23 2018 +0200
+
+    I18n: Update translation ca (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 03885d9faf9289195e55790e27c4fafeb7c006a6
+Author: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>
+Date:   Mon Oct 22 12:32:21 2018 +0200
+
+    I18n: Update translation ca (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit f7008d021bc9c2f36f24f309229093f2be51533c
+Author: Daniel Muñiz Fontoira <dani@damufo.com>
+Date:   Tue Oct 2 12:33:04 2018 +0200
+
+    I18n: Update translation gl (100%).
+    
+    42 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 0222f15b66ae7394acf07258919597423f9386d5
+Author: Andre Miranda <andreldm@xfce.org>
+Date:   Sat Sep 22 17:53:01 2018 -0300
+
+    Post release tag bump
+
 commit 06b31b0fb4794b5b38e45ffb35be966e57d0a632
 Author: Andre Miranda <andreldm@xfce.org>
 Date:   Sat Sep 22 17:42:46 2018 -0300

--- a/Makefile.in
+++ b/Makefile.in
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -135,7 +135,7 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -232,6 +232,10 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_UNIX_REQUIRED_VERSION = @GIO_UNIX_REQUIRED_VERSION@
+GIO_UNIX_VERSION = @GIO_UNIX_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -416,8 +420,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -559,7 +563,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

--- a/NEWS
+++ b/NEWS
+1.1.2 (2019/01/13):
+===================
+* Listen for UPower events for power source changes (Bug #14978, thanks to Alexander Butenko)
+* Reset averages when a battery is removed/added (Bug #14930, thanks to John Lindgren)
+* Re-detect battery presence every 30 seconds (Bug #14930, thanks to John Lindgren)
+* Fix null pointer dereference with no battery present (Bug #14930, thanks to John Lindgren)
+* Remove deprecated /proc/acpi support in favor of sysfs. (Thanks to John Lindgren)
+* Remove APM support on FreeBSD as well, it doesn't even build. (Thanks to John Lindgren)
+* Remove historical APM support for Linux, support ACPI only. (Thanks to John Lindgren)
+* Initially show/hide widgets according to user config (Bug #9594, thanks to John Lindgren)
+
 1.1.1 (2018/09/22):
 ===================
 * Avoid memory leaks

--- a/aclocal.m4
+++ b/aclocal.m4
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-

-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10128,7 +10128,7 @@ 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-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10140,10 +10140,10 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@@ -10159,14 +10159,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10218,7 +10218,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10249,7 +10249,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])

-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10440,13 +10440,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -10454,49 +10453,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  # Older Autoconf quotes --file arguments for eval, but not when files
  # are listed without --file.  Let's play safe and only enable the eval
  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
  shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
  do
    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
  done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS

@@ -10505,18 +10496,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])

 # Do all the work for Automake.                             -*- Autoconf -*-

-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10603,8 +10593,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -10671,7 +10661,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.

 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.

 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -10713,7 +10703,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10734,7 +10724,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])

-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10756,7 +10746,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering

-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10791,7 +10781,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

 # Check to see how 'make' treats includes.	            -*- Autoconf -*-

-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10799,49 +10789,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
  fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])

 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10882,7 +10865,7 @@ fi
 # Obsolete and "removed" macros, that must however still report explicit
 # error messages when used, to smooth transition.
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10909,7 +10892,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])

 # Helper functions for option handling.                     -*- Autoconf -*-

-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10938,7 +10921,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10985,7 +10968,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11004,7 +10987,7 @@ AC_DEFUN([AM_RUN_LOG],

 # Check to make sure that the build environment is sane.    -*- Autoconf -*-

-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11085,7 +11068,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])

-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11145,7 +11128,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])

-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11173,7 +11156,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])

-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11192,7 +11175,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

 # Check how to create a tarball.                            -*- Autoconf -*-

-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

--- a/compile
+++ b/compile
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.

-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC

-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -340,7 +340,7 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"

--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
--- a/configure
+++ b/configure
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-battery-plugin 1.1.1.
+# Generated by GNU Autoconf 2.69 for xfce4-battery-plugin 1.1.2.
 #
 # Report bugs to <http://bugzilla.xfce.org/>.
 #
-# Copyright (c) 2006-2016
-#         The Xfce development team. All rights reserved.
+# Copyright (c) 2006-2019 The Xfce development team. All rights reserved.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -593,8 +592,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xfce4-battery-plugin'
 PACKAGE_TARNAME='xfce4-battery-plugin'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='xfce4-battery-plugin 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='xfce4-battery-plugin 1.1.2'
 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
 PACKAGE_URL=''

@@ -638,6 +637,10 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+GIO_UNIX_REQUIRED_VERSION
+GIO_UNIX_LIBS
+GIO_UNIX_CFLAGS
+GIO_UNIX_VERSION
 LIBXFCE4PANEL_REQUIRED_VERSION
 LIBXFCE4PANEL_LIBS
 LIBXFCE4PANEL_CFLAGS
@@ -737,7 +740,6 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -826,7 +828,8 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -1398,7 +1401,7 @@ if test "$ac_init_help" = "long"; then
  # 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-battery-plugin 1.1.1 to adapt to many kinds of systems.
+\`configure' configures xfce4-battery-plugin 1.1.2 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1470,7 +1473,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of xfce4-battery-plugin 1.1.1:";;
+     short | recursive ) echo "Configuration of xfce4-battery-plugin 1.1.2:";;
   esac
  cat <<\_ACEOF

@@ -1595,15 +1598,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-xfce4-battery-plugin configure 1.1.1
+xfce4-battery-plugin configure 1.1.2
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.

-Copyright (c) 2006-2016
-        The Xfce development team. All rights reserved.
+Copyright (c) 2006-2019 The Xfce development team. All rights reserved.
 _ACEOF
  exit
 fi
@@ -1967,7 +1969,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by xfce4-battery-plugin $as_me 1.1.1, which was
+It was created by xfce4-battery-plugin $as_me 1.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2456,7 +2458,7 @@ test -n "$target_alias" &&
    NONENONEs,x,x, &&
  program_prefix=${target_alias}-

-am__api_version='1.15'
+am__api_version='1.16'

 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2942,7 +2944,7 @@ fi

 # Define the identity of the package.
 PACKAGE='xfce4-battery-plugin'
- VERSION='1.1.1'
+ VERSION='1.1.2'


 cat >>confdefs.h <<_ACEOF
@@ -2972,8 +2974,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'

 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -3140,7 +3142,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.

 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.

 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -4067,45 +4069,45 @@ DEPDIR="${am__leading_dot}deps"

 ac_config_commands="$ac_config_commands depfiles"

-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
     ;;
 esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
  fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }

 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@@ -14464,6 +14466,201 @@ $as_echo "not found" >&6; }



+  # minimum supported version of pkg-config
+  xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${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; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.28.0" >&5
+$as_echo_n "checking for gio-2.0 >= 2.28.0... " >&6; }
+  if $PKG_CONFIG "--atleast-version=2.28.0" "gio-2.0" >/dev/null 2>&1; then
+    GIO_UNIX_VERSION=`$PKG_CONFIG --modversion "gio-2.0"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_UNIX_VERSION" >&5
+$as_echo "$GIO_UNIX_VERSION" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_UNIX_CFLAGS" >&5
+$as_echo_n "checking GIO_UNIX_CFLAGS... " >&6; }
+    GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_UNIX_CFLAGS" >&5
+$as_echo "$GIO_UNIX_CFLAGS" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_UNIX_LIBS" >&5
+$as_echo_n "checking GIO_UNIX_LIBS... " >&6; }
+    GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-2.0"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_UNIX_LIBS" >&5
+$as_echo "$GIO_UNIX_LIBS" >&6; }
+
+    GIO_UNIX_REQUIRED_VERSION=2.28.0
+
+
+
+
+
+
+
+  elif $PKG_CONFIG --exists "gio-2.0" >/dev/null 2>&1; then
+    xdt_cv_version=`$PKG_CONFIG --modversion "gio-2.0"`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5
+$as_echo "found, but $xdt_cv_version" >&6; }
+
+
+      echo "*** The required package gio-2.0 was found on your system,"
+      echo "*** but the installed version ($xdt_cv_version) is too old."
+      echo "*** Please upgrade gio-2.0 to atleast version 2.28.0, or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+      echo "*** the new version of the package in a nonstandard prefix so"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+
+      echo "*** The required package gio-2.0 was not found on your system."
+      echo "*** Please install gio-2.0 (atleast version 2.28.0) or adjust"
+      echo "*** the PKG_CONFIG_PATH environment variable if you"
+      echo "*** installed the package in a nonstandard prefix so that"
+      echo "*** pkg-config is able to find it."
+      exit 1
+
+  fi
+
+
+
    # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
  enableval=$enable_debug; enable_debug=$enableval
@@ -15098,7 +15295,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfce4-battery-plugin $as_me 1.1.1, which was
+This file was extended by xfce4-battery-plugin $as_me 1.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -15164,7 +15361,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xfce4-battery-plugin config.status 1.1.1
+xfce4-battery-plugin config.status 1.1.2
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@@ -15283,7 +15480,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"


 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -16190,29 +16387,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
  # Older Autoconf quotes --file arguments for eval, but not when files
  # are listed without --file.  Let's play safe and only enable the eval
  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
 esac
  shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
  do
    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -16230,53 +16433,48 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\).*/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
  done
+  if test $am_rc -ne 0; then
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
 ;;
    "libtool":C)

--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl 2003      Benedikt Meurer <benny@xfce.org>
 dnl 2006-2007 Nick Schermer <nick@xfce.org>
 dnl 2010      Florian Rivoal <frivoal@xfce.org>
 dnl 2012      Landry Breuil <landry@xfce.org>
-dnl 2016      Andre Miranda <andre42m@gmail.com>
+dnl 2016-2019 Andre Miranda <andreldm@xfce.org>
 dnl

 dnl ***************************
@@ -17,16 +17,15 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([battery_version_major], [1])
 m4_define([battery_version_minor], [1])
-m4_define([battery_version_micro], [1])
-m4_define([battery_version_build], [r06b31b0])
+m4_define([battery_version_micro], [2])
+m4_define([battery_version_build], [r6f3bba6])
 m4_define([battery_version_tag], [])
 m4_define([battery_version], [battery_version_major().battery_version_minor().battery_version_micro()ifelse(battery_version_tag(), [svn], [battery_version_tag()-battery_version_build()], [battery_version_tag()])])

 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2016
-        The Xfce development team. All rights reserved.])
+AC_COPYRIGHT([Copyright (c) 2006-2019 The Xfce development team. All rights reserved.])
 AC_INIT([xfce4-battery-plugin], [battery_version], [http://bugzilla.xfce.org/], [xfce4-battery-plugin])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
@@ -74,6 +73,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.16.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
+XDT_CHECK_PACKAGE([GIO_UNIX], [gio-2.0], [2.28.0])

 dnl ***********************************
 dnl *** Check for debugging support ***

--- a/debian/changelog
+++ b/debian/changelog
+xfce4-battery-plugin (1.1.2-1) unstable; urgency=medium
+
+  * New upstream version 1.1.2
+  * d/p/01_no-sysctl.patch refreshed and imported in gbp pq
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 16 Jan 2019 13:19:58 +0100
+
 xfce4-battery-plugin (1.1.1-1) unstable; urgency=medium

  * Moved the package to git on salsa.debian.org

--- a/debian/compat
+++ b/debian/compat
-10
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 10),
               intltool,
               libgtk-3-dev,
               libtool,
@@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 10),
               libxfce4ui-2-dev (>= 4.12),
               libxfce4util-dev,
               xfce4-dev-tools
-Standards-Version: 3.9.8
-Homepage: http://goodies.xfce.org/
+Standards-Version: 4.3.0
+Homepage: https://goodies.xfce.org/
 Vcs-Git: https://salsa.debian.org/xfce-team/goodies/xfce4-battery-plugin.git
 Vcs-Browser: https://salsa.debian.org/xfce-team/goodies/xfce4-battery-plugin


--- a/debian/patches/01_no-sysctl.patch
+++ b/debian/patches/01_no-sysctl.patch
+From: Yves-Alexis Perez <corsac@debian.org>
+Date: Mon, 14 Jan 2019 13:38:45 +0100
+Subject: Inconditionnaly include err.h and errno.h
+
+HAVE_SYSCTL is false on new architectures like arm64 or x32, and build
+will fail (#766766).
+---
+ panel-plugin/libacpi.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
+index 0865c62..be7ba45 100644
 --- a/panel-plugin/libacpi.c
 +++ b/panel-plugin/libacpi.c
-@@ -51,11 +51,12 @@ static int      acpifd;
+@@ -53,11 +53,11 @@ static int      acpifd;
 #endif
 
 #include <sys/sysctl.h>
-#include <err.h>
-#include <errno.h>
- 
- #endif
- 
-+#include <err.h>
-+#include <errno.h>
+#endif
 +
+ #include <err.h>
+ #include <errno.h>
+ 
+-#endif
+-
 #include "libacpi.h"
 
- #define ACBASE "/proc/acpi/ac_adapter"
+ static char batteries[MAXBATT][128];
--- a/debian/watch
+++ b/debian/watch
 version=3
-http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/([\d\.]+)/ \
+https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/([\d\.]+)/ \
 	xfce4-battery-plugin-([\d\.]+)\.tar\.(?:gz|bz2)
--- a/depcomp
+++ b/depcomp
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC

-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,7 +783,7 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"

--- a/icons/16x16/Makefile.in
+++ b/icons/16x16/Makefile.in
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -180,6 +180,10 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_UNIX_REQUIRED_VERSION = @GIO_UNIX_REQUIRED_VERSION@
+GIO_UNIX_VERSION = @GIO_UNIX_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -351,8 +355,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -397,7 +401,10 @@ ctags CTAGS:
 cscope cscopelist:


-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

--- a/icons/22x22/Makefile.in
+++ b/icons/22x22/Makefile.in
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -180,6 +180,10 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_UNIX_REQUIRED_VERSION = @GIO_UNIX_REQUIRED_VERSION@
+GIO_UNIX_VERSION = @GIO_UNIX_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -351,8 +355,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -397,7 +401,10 @@ ctags CTAGS:
 cscope cscopelist:


-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

--- a/icons/24x24/Makefile.in
+++ b/icons/24x24/Makefile.in
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -180,6 +180,10 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_UNIX_REQUIRED_VERSION = @GIO_UNIX_REQUIRED_VERSION@
+GIO_UNIX_VERSION = @GIO_UNIX_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -351,8 +355,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -397,7 +401,10 @@ ctags CTAGS:
 cscope cscopelist:


-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

--- a/icons/32x32/Makefile.in
+++ b/icons/32x32/Makefile.in
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -180,6 +180,10 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
+GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
+GIO_UNIX_REQUIRED_VERSION = @GIO_UNIX_REQUIRED_VERSION@
+GIO_UNIX_VERSION = @GIO_UNIX_VERSION@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -347,8 +351,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -393,7 +397,10 @@ ctags CTAGS:
 cscope cscopelist:


-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \