Merge branch 'ubports/focal_-_5g' into 'main'

Sync with upstream, fix display signal and add support for ayatana battery and charger See merge request ubports/development/core/hybris-support/libmce-glib-repowerd-stub!1
d/ubports.skip_distro: skip building on Debian
2024-08-09 08:08:05 +00:00 · 2024-08-09 07:14:40 +00:00 · 2024-07-13 23:22:24 +03:00 · 2023-09-21 04:17:14 +02:00 · 2023-09-21 04:17:10 +02:00 · 2023-09-21 03:59:35 +02:00
33 changed files with 2873 additions and 145 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,12 @@ debian/libmce-glib
 debian/libmce-glib-dev
 debian/*.debhelper.log
 debian/*.debhelper
+debian/*.install
 debian/*.substvars
 debian/tmp
 documentation.list
 installroot
 build
 RPMS
+examples/example
+examples/example.o
--- a/33
+++ b/33
@@ -0,0 +1,33 @@
+Copyright (C) 2016-2022 Jolla Ltd.
+Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
+
+You may use this file under the terms of BSD license as follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the names of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation
+are those of the authors and should not be interpreted as representing
+any official policies, either expressed or implied.
--- a/87
+++ b/87
@@ -1,6 +1,6 @@
 # -*- Mode: makefile-gmake -*-

-.PHONY: clean all debug release pkgconfig
+.PHONY: clean all debug release pkgconfig install install-dev

 #
 # Required packages
@@ -19,8 +19,8 @@ all: debug release pkgconfig
 #

 VERSION_MAJOR = 1
-VERSION_MINOR = 0
-VERSION_RELEASE = 5
+VERSION_MINOR = 1
+VERSION_RELEASE = 0

 # Version for pkg-config
 PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
@@ -38,11 +38,15 @@ LIB = $(LIB_SONAME).$(VERSION_MINOR).$(VERSION_RELEASE)
 #

 SRC = \
+  mce_battery.c \
+  mce_charger.c \
  mce_display.c \
  mce_proxy.c
 GEN_SRC = \
-  com.canonical.Unity.Screen.c
+  com.canonical.Unity.Screen.c \
+  org.freedesktop.UPower.Device.c

+#  mce_inactivity.c \
 #
 # Directories
 #
@@ -59,30 +63,29 @@ RELEASE_BUILD_DIR = $(BUILD_DIR)/release
 # Tools and flags
 #

-CC = $(CROSS_COMPILE)gcc
+CC ?= $(CROSS_COMPILE)gcc
 LD = $(CC)
+DEFINES += -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \
+  -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED
 WARNINGS = -Wall -Wno-unused-parameter -Wno-multichar
 INCLUDES = -I$(INCLUDE_DIR) -I$(GEN_DIR)
 BASE_FLAGS = -fPIC $(CFLAGS)
 FULL_CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
  $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) -shared -Wl,-soname -Wl,$(LIB_SONAME) \
-  $(shell pkg-config --libs $(PKGS))
+FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIB_SONAME) \
+  -Wl,--version-script=$(LIB_NAME).map
 DEBUG_FLAGS = -g
 RELEASE_FLAGS =

-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
+KEEP_SYMBOLS ?= 0
 ifneq ($(KEEP_SYMBOLS),0)
 RELEASE_FLAGS += -g
 endif

 DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
 RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
+DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_FLAGS)
+RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_FLAGS)

 #
 # Files
@@ -97,6 +100,7 @@ RELEASE_OBJS = \
  $(GEN_SRC:%.c=$(RELEASE_BUILD_DIR)/%.o) \
  $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
 GEN_FILES = $(GEN_SRC:%=$(GEN_DIR)/%)
+LIBS = $(shell pkg-config --libs $(PKGS))
 .PRECIOUS: $(GEN_FILES)

 #
@@ -110,31 +114,33 @@ ifneq ($(strip $(DEPS)),)
 endif
 endif

-$(GEN_FILES): | $(GEN_DIR)
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
 DEBUG_LIB = $(DEBUG_BUILD_DIR)/$(LIB)
 RELEASE_LIB = $(RELEASE_BUILD_DIR)/$(LIB)
 DEBUG_LINK = $(DEBUG_BUILD_DIR)/$(LIB_SONAME)
 RELEASE_LINK = $(RELEASE_BUILD_DIR)/$(LIB_SONAME)

+$(GEN_FILES): | $(GEN_DIR)
+$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR) $(GEN_FILES)
+$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR) $(GEN_FILES)
+$(PKGCONFIG): | $(BUILD_DIR)
+$(DEBUG_LINK): | $(DEBUG_LIB)
+$(RELEASE_LINK): | $(RELEASE_LIB)
+
+#
+# Rules
+#
+
 debug: $(DEBUG_LIB) $(DEBUG_LINK)

 release: $(RELEASE_LIB) $(RELEASE_LINK)

-pkgconfig: $(PKGCONFIG)
-
 clean:
 	rm -f *~ $(SRC_DIR)/*~ $(INCLUDE_DIR)/*~ rpm/*~
 	rm -fr $(BUILD_DIR) RPMS installroot
 	rm -fr debian/tmp debian/lib$(NAME) debian/lib$(NAME)-dev
 	rm -f documentation.list debian/files debian/*.substvars
 	rm -f debian/*.debhelper.log debian/*.debhelper debian/*~
+	rm -f debian/*.install

 $(GEN_DIR):
 	mkdir -p $@
@@ -160,11 +166,11 @@ $(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
 $(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
 	$(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@

-$(DEBUG_LIB): $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
-	$(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) -o $@
+$(DEBUG_LIB): $(DEBUG_OBJS)
+	$(LD) $(DEBUG_LDFLAGS) -o $@ $^ $(LIBS)

-$(RELEASE_LIB): $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
-	$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
+$(RELEASE_LIB): $(RELEASE_OBJS)
+	$(LD) $(RELEASE_LDFLAGS) -o $@ $^ $(LIBS)
 ifeq ($(KEEP_SYMBOLS),0)
 	strip $@
 endif
@@ -175,29 +181,32 @@ $(DEBUG_LINK):
 $(RELEASE_LINK):
 	ln -sf $(LIB) $@

-$(PKGCONFIG): $(LIB_NAME).pc.in
-	sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@
+# This one could be substituted with arch specific dir
+LIBDIR ?= /usr/lib
+ABS_LIBDIR := $(shell echo /$(LIBDIR) | sed -r 's|/+|/|g')
+
+pkgconfig: $(PKGCONFIG)
+
+$(PKGCONFIG): $(LIB_NAME).pc.in Makefile
+	sed -e 's|@version@|$(PCVERSION)|g' -e 's|@libdir@|$(ABS_LIBDIR)|g' $< > $@
+
+debian/%.install: debian/%.install.in
+	sed 's|@LIBDIR@|$(LIBDIR)|g' $< > $@

 #
 # Install
 #

-INSTALL_PERM  = 644
-INSTALL_OWNER = $(shell id -u)
-INSTALL_GROUP = $(shell id -g)
-
 INSTALL = install
 INSTALL_DIRS = $(INSTALL) -d
-INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM)
+INSTALL_FILES = $(INSTALL) -m 644

-INSTALL_LIB_DIR = $(DESTDIR)/usr/lib
+INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR)
 INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(LIB_NAME)
-INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig
-
-INSTALL_ALIAS = $(INSTALL_LIB_DIR)/$(LIB_SHORTCUT)
+INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig

 install: $(INSTALL_LIB_DIR)
-	$(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR)
+	$(INSTALL) -m 755 $(RELEASE_LIB) $(INSTALL_LIB_DIR)
 	ln -sf $(LIB) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2)
 	ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,54 @@
-libmce-glib (1.0.5+gemian) buster; urgency=low
+libmce-glib (1.1.0) unstable; urgency=low

-  * Branched for Gemian
+  * Add an example application
+  * Add MceInactivity object

- -- Adam Boardman <adamboardman@gmail.com>  Thu, 7 Jun 2018 16:25:48 +0100
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Mon, 08 May 2023 10:46:08 +0300
+
+libmce-glib (1.0.13) unstable; urgency=low
+
+  * Shuffled includes a bit
+  * Unified and freshened up licenses
+
+ -- Slava Monich <slava.monich@jolla.com>  Wed, 19 Jan 2022 14:21:38 +0200
+
+libmce-glib (1.0.12) unstable; urgency=low
+
+  * Housekeeping release
+
+ -- Slava Monich <slava.monich@jolla.com>  Mon, 08 Nov 2021 02:44:15 +0200
+
+libmce-glib (1.0.10) unstable; urgency=low
+
+  * Hide internal symbols
+  * Respect arch specific lib dir
+
+ -- Slava Monich <slava.monich@jolla.com>  Mon, 25 May 2020 15:11:04 +0300
+
+libmce-glib (1.0.9) unstable; urgency=low
+
+  * Ignore GLib deprecation warnings
+
+ -- Slava Monich <slava.monich@jolla.com>  Sun, 08 Mar 2020 16:30:35 +0200
+
+libmce-glib (1.0.8) unstable; urgency=low
+
+  * Avoid overlinking
+
+ -- Slava Monich <slava.monich@jolla.com>  Tue, 05 Nov 2019 14:21:43 +0300
+
+libmce-glib (1.0.7) unstable; urgency=low
+
+  * Allow use of CC & LDFLAGS defined by build system
+
+ -- Slava Monich <slava.monich@jolla.com>  Fri, 30 Aug 2019 18:14:21 +0300
+
+libmce-glib (1.0.6) unstable; urgency=low
+
+  * Added MceBattery object
+  * Added MceCharger object
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 22 Aug 2019 12:14:38 +0300

 libmce-glib (1.0.5) unstable; urgency=low

--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: libmce-glib
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libglibutil (>= 1.0.5), ${shlibs:Depends}, ${misc:Depends}
 Description: Client library for mce

 Package: libmce-glib-dev
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,5 @@
-Copyright (C) 2016 Jolla Ltd.
+Copyright (C) 2016-2022 Jolla Ltd.
+Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>

 You may use this file under the terms of BSD license as follows:

@@ -11,9 +12,9 @@ are met:
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
-  3. Neither the name of Jolla Ltd nor the names of its contributors may
-     be used to endorse or promote products derived from this software
-     without specific prior written permission.
+  3. Neither the names of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--- a/debian/libmce-glib-dev.install
+++ b/debian/libmce-glib-dev.install
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libmce-glib.so usr/lib
-include/*.h usr/include/libmce-glib
-build/libmce-glib.pc usr/lib/pkgconfig
--- a/debian/libmce-glib-dev.install.in
+++ b/debian/libmce-glib-dev.install.in
@@ -0,0 +1,3 @@
+debian/tmp/@LIBDIR@/libmce-glib.so @LIBDIR@
+debian/tmp/@LIBDIR@/pkgconfig/libmce-glib.pc @LIBDIR@/pkgconfig
+debian/tmp/usr/include/* usr/include
--- a/debian/libmce-glib.install
+++ b/debian/libmce-glib.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libmce-glib.so.* usr/lib
--- a/debian/libmce-glib.install.in
+++ b/debian/libmce-glib.install.in
@@ -0,0 +1 @@
+debian/tmp/@LIBDIR@/libmce-glib.so.* @LIBDIR@
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

+LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+override_dh_auto_build:
+	dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libmce-glib.install debian/libmce-glib-dev.install
+
 override_dh_auto_install:
-	dh_auto_install -- install-dev
+	dh_auto_install -- LIBDIR=$(LIBDIR) install-dev

 %:
 	dh $@
--- a/debian/ubports.skip_distro
+++ b/debian/ubports.skip_distro
@@ -0,0 +1,3 @@
+# libglibutil is not packaged in both Debian and UBports `devel-debian`.
+# There's not point in this package in Debian anyway.
+devel-debian
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -0,0 +1,15 @@
+.PHONY: build clean mostlyclean
+build::
+clean:: mostlyclean
+mostlyclean:: ;	$(RM) *.o *~ *.bak
+PKG_NAMES += glib-2.0
+PKG_NAMES += libmce-glib
+CPPFLAGS  += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS    += -Wall -Wextra -Os -g -std=c99
+LDFLAGS   += -g
+LDLIBS    += -Wl,--as-needed
+CFLAGS    += $(shell pkg-config --cflags $(PKG_NAMES))
+LDLIBS    += $(shell pkg-config --libs $(PKG_NAMES))
+example : example.o
+build:: example
+clean:: ; $(RM) example
--- a/examples/example.c
+++ b/examples/example.c
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2023 Jolla Ltd.
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdbool.h>
+
+#include <glib.h>
+#include <glib-unix.h>
+
+#include <mce_battery.h>
+#include <mce_charger.h>
+#include <mce_display.h>
+//#include <mce_inactivity.h>
+//#include <mce_tklock.h>
+
+/* ========================================================================= *
+ * MAINLOOP
+ * ========================================================================= */
+
+static  int        mainloop_result = EXIT_SUCCESS;
+static  GMainLoop *mainloop_handle = NULL;
+
+static void mainloop_exit(int exitcode)
+{
+    if( mainloop_result < exitcode )
+        mainloop_result = exitcode;
+    if( !mainloop_handle )
+        exit(mainloop_result);
+    g_main_loop_quit(mainloop_handle);
+}
+
+static void mainloop_quit(void)
+{
+    mainloop_exit(EXIT_SUCCESS);
+}
+
+static int mainloop_run(void)
+{
+    mainloop_handle = g_main_loop_new(NULL, false);
+    g_main_loop_run(mainloop_handle);
+    g_main_loop_unref(mainloop_handle),
+        mainloop_handle = NULL;
+    return mainloop_result;
+}
+
+/* ========================================================================= *
+ * STATUS
+ * ========================================================================= */
+
+static const char *bool_repr(bool value)
+{
+    return value ? "true" : "false";
+}
+
+static const char *battery_status_repr(MCE_BATTERY_STATUS status)
+{
+    static const char * const lut[] = {
+        [MCE_BATTERY_UNKNOWN]   = "unknown",
+        [MCE_BATTERY_EMPTY]     = "empty",
+        [MCE_BATTERY_LOW]       = "low",
+        [MCE_BATTERY_OK]        = "ok",
+        [MCE_BATTERY_FULL]      = "full",
+    };
+    return lut[status];
+}
+
+static const char *charger_state_repr(MCE_CHARGER_STATE state)
+{
+    static const char * const lut[] = {
+        [MCE_CHARGER_UNKNOWN] = "unknown",
+        [MCE_CHARGER_ON]      = "on",
+        [MCE_CHARGER_OFF]     = "off",
+    };
+    return lut[state];
+}
+
+static const char *display_state_repr(MCE_DISPLAY_STATE state)
+{
+    static const char * const lut[] = {
+        [MCE_DISPLAY_STATE_OFF] = "off",
+        [MCE_DISPLAY_STATE_ON]  = "on",
+    };
+    return lut[state];
+}
+
+/*
+static const char *tklock_mode_repr(MCE_TKLOCK_MODE mode)
+{
+    static const char * const lut[] = {
+        [MCE_TKLOCK_MODE_LOCKED]            = "locked",
+        [MCE_TKLOCK_MODE_SILENT_LOCKED]     = "silent_locked",
+        [MCE_TKLOCK_MODE_LOCKED_DIM]        = "locked_dim",
+        [MCE_TKLOCK_MODE_LOCKED_DELAY]      = "locked_delay",
+        [MCE_TKLOCK_MODE_SILENT_LOCKED_DIM] = "silent_locked_dim",
+        [MCE_TKLOCK_MODE_UNLOCKED]          = "unlocked",
+        [MCE_TKLOCK_MODE_SILENT_UNLOCKED]   = "silent_unlocked",
+    };
+    return lut[mode];
+}
+*/
+
+static void battery_cb(MceBattery *battery, void *arg)
+{
+    const char *what_changed = arg;
+    printf("battery: valid=%s level=%d status=%s (%s changed)\n",
+           bool_repr(battery->valid),
+           battery->level,
+           battery_status_repr(battery->status),
+           what_changed);
+}
+
+static void charger_cb(MceCharger *charger, void *arg)
+{
+    const char *what_changed = arg;
+    printf("charger: valid=%s state=%s (%s changed)\n",
+           bool_repr(charger->valid),
+           charger_state_repr(charger->state),
+           what_changed);
+}
+
+static void display_cb(MceDisplay *display, void *arg)
+{
+    const char *what_changed = arg;
+    printf("display: valid=%s state=%s (%s changed)\n",
+           bool_repr(display->valid),
+           display_state_repr(display->state),
+           what_changed);
+}
+
+/*
+static void tklock_cb(MceTklock *tklock, void *arg)
+{
+    const char *what_changed = arg;
+    printf("tklock: valid=%s mode=%s locked=%s (%s changed)\n",
+           bool_repr(tklock->valid),
+           tklock_mode_repr(tklock->mode),
+           bool_repr(tklock->locked),
+           what_changed);
+}
+
+
+static void inactivity_cb(MceInactivity *inactivity, void *arg)
+{
+    const char *what_changed = arg;
+    printf("inactivity: valid=%s status=%s (%s changed)\n",
+           bool_repr(inactivity->valid),
+           bool_repr(inactivity->status),
+           what_changed);
+}
+*/
+
+/* ========================================================================= *
+ * MAIN_ENTRY
+ * ========================================================================= */
+
+static gboolean quit_cb(gpointer aptr)
+{
+    printf("quit\n");
+    mainloop_quit();
+    guint *id_ptr = aptr;
+    *id_ptr = 0;
+    return G_SOURCE_REMOVE;
+}
+
+int
+main(int argc, char **argv)
+{
+    printf("startup\n");
+
+    int exitcode = EXIT_FAILURE;
+
+    MceBattery *battery = mce_battery_new();
+    gulong battery_valid_id =
+        mce_battery_add_valid_changed_handler(battery, battery_cb, "valid");
+    gulong battery_level_id =
+        mce_battery_add_level_changed_handler(battery, battery_cb, "level");
+    gulong battery_status_id =
+        mce_battery_add_status_changed_handler(battery, battery_cb, "status");
+
+    MceCharger *charger = mce_charger_new();
+    gulong charger_valid_id =
+        mce_charger_add_valid_changed_handler(charger, charger_cb, "valid");
+    gulong charger_state_id =
+        mce_charger_add_state_changed_handler(charger, charger_cb, "state");
+
+    MceDisplay *display = mce_display_new();
+    gulong display_valid_id =
+        mce_display_add_valid_changed_handler(display, display_cb, "valid");
+    gulong display_state_id =
+        mce_display_add_state_changed_handler(display, display_cb, "state");
+
+/*
+    MceTklock *tklock = mce_tklock_new();
+    gulong tklock_valid_id =
+        mce_tklock_add_valid_changed_handler(tklock, tklock_cb, "valid");
+    gulong tklock_mode_id =
+        mce_tklock_add_mode_changed_handler(tklock, tklock_cb, "mode");
+    gulong tklock_locked_id =
+        mce_tklock_add_locked_changed_handler(tklock, tklock_cb, "locked");
+
+    MceInactivity *inactivity = mce_inactivity_new();
+    gulong inactivity_valid_id =
+        mce_inactivity_add_valid_changed_handler(inactivity, inactivity_cb, "valid");
+    gulong inactivity_status_id =
+        mce_inactivity_add_status_changed_handler(inactivity, inactivity_cb, "status");
+*/
+    guint timeout_id = 0;
+    gint timeout_s = (argc > 1) ? strtol(argv[1], NULL, 0) : 0;
+    if( timeout_s > 0)
+        timeout_id = g_timeout_add(timeout_s * 1000, quit_cb, &timeout_id);
+
+    guint sigterm_id = g_unix_signal_add(SIGTERM, quit_cb, &sigterm_id);
+    guint sigint_id = g_unix_signal_add(SIGINT, quit_cb, &sigint_id);
+
+    printf("mainloop\n");
+    exitcode = mainloop_run();
+    printf("cleanup\n");
+
+    if( sigterm_id )
+        g_source_remove(sigterm_id);
+    if( sigint_id )
+        g_source_remove(sigint_id);
+    if( timeout_id )
+        g_source_remove(timeout_id);
+
+    mce_battery_remove_handler(battery, battery_valid_id);
+    mce_battery_remove_handler(battery, battery_level_id);
+    mce_battery_remove_handler(battery, battery_status_id);
+    mce_battery_unref(battery);
+
+    mce_charger_remove_handler(charger, charger_valid_id);
+    mce_charger_remove_handler(charger, charger_state_id);
+    mce_charger_unref(charger);
+
+    mce_display_remove_handler(display, display_valid_id);
+    mce_display_remove_handler(display, display_state_id);
+    mce_display_unref(display);
+
+/*
+    mce_tklock_remove_handler(tklock, tklock_valid_id);
+    mce_tklock_remove_handler(tklock, tklock_mode_id);
+    mce_tklock_remove_handler(tklock, tklock_locked_id);
+    mce_tklock_unref(tklock);
+
+    mce_inactivity_remove_handler(inactivity, inactivity_valid_id);
+    mce_inactivity_remove_handler(inactivity, inactivity_status_id);
+    mce_inactivity_unref(inactivity);
+*/
+    printf("exit\n");
+    return exitcode;
+}
--- a/include/mce_battery.h
+++ b/include/mce_battery.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2019-2022 Jolla Ltd.
+ * Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef MCE_BATTERY_H
+#define MCE_BATTERY_H
+
+/* Since 1.0.6 */
+
+#include "mce_types.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef enum mce_battery_status {
+    MCE_BATTERY_UNKNOWN,
+    MCE_BATTERY_EMPTY,
+    MCE_BATTERY_LOW,
+    MCE_BATTERY_OK,
+    MCE_BATTERY_FULL
+} MCE_BATTERY_STATUS;
+
+typedef struct mce_battery_priv MceBatteryPriv;
+
+struct mce_battery {
+    GObject object;
+    MceBatteryPriv* priv;
+    gboolean valid;
+    guint level;
+    MCE_BATTERY_STATUS status;
+}; /* MceBattery */
+
+typedef void
+(*MceBatteryFunc)(
+    MceBattery* battery,
+    void* arg);
+
+MceBattery*
+mce_battery_new(
+    void);
+
+MceBattery*
+mce_battery_ref(
+    MceBattery* battery);
+
+void
+mce_battery_unref(
+    MceBattery* battery);
+
+gulong
+mce_battery_add_valid_changed_handler(
+    MceBattery* battery,
+    MceBatteryFunc fn,
+    void* arg);
+
+gulong
+mce_battery_add_level_changed_handler(
+    MceBattery* battery,
+    MceBatteryFunc fn,
+    void* arg);
+
+gulong
+mce_battery_add_status_changed_handler(
+    MceBattery* battery,
+    MceBatteryFunc fn,
+    void* arg);
+
+void
+mce_battery_remove_handler(
+    MceBattery* battery,
+    gulong id);
+
+void
+mce_battery_remove_handlers(
+    MceBattery* battery,
+    gulong* ids,
+    guint count);
+
+#define mce_battery_remove_all_handlers(d, ids) \
+    mce_battery_remove_handlers(d, ids, G_N_ELEMENTS(ids))
+
+G_END_DECLS
+
+#endif /* MCE_BATTERY_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--- a/include/mce_charger.h
+++ b/include/mce_charger.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2019-2022 Jolla Ltd.
+ * Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef MCE_CHARGER_H
+#define MCE_CHARGER_H
+
+/* Since 1.0.6 */
+
+#include "mce_types.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef enum mce_charger_state {
+    MCE_CHARGER_UNKNOWN,
+    MCE_CHARGER_ON,
+    MCE_CHARGER_OFF
+} MCE_CHARGER_STATE;
+
+typedef struct mce_charger_priv MceChargerPriv;
+
+struct mce_charger {
+    GObject object;
+    MceChargerPriv* priv;
+    gboolean valid;
+    MCE_CHARGER_STATE state;
+}; /* MceCharger */
+
+typedef void
+(*MceChargerFunc)(
+    MceCharger* charger,
+    void* arg);
+
+MceCharger*
+mce_charger_new(
+    void);
+
+MceCharger*
+mce_charger_ref(
+    MceCharger* charger);
+
+void
+mce_charger_unref(
+    MceCharger* charger);
+
+gulong
+mce_charger_add_valid_changed_handler(
+    MceCharger* charger,
+    MceChargerFunc fn,
+    void* arg);
+
+gulong
+mce_charger_add_state_changed_handler(
+    MceCharger* charger,
+    MceChargerFunc fn,
+    void* arg);
+
+void
+mce_charger_remove_handler(
+    MceCharger* charger,
+    gulong id);
+
+void
+mce_charger_remove_handlers(
+    MceCharger* charger,
+    gulong* ids,
+    guint count);
+
+#define mce_charger_remove_all_handlers(d, ids) \
+    mce_charger_remove_handlers(d, ids, G_N_ELEMENTS(ids))
+
+G_END_DECLS
+
+#endif /* MCE_CHARGER_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--- a/include/mce_display.h
+++ b/include/mce_display.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016-2017 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -39,6 +39,8 @@

 #include "mce_types.h"

+#include <glib-object.h>
+
 G_BEGIN_DECLS

 typedef enum mce_display_state {
@@ -48,12 +50,12 @@ typedef enum mce_display_state {

 typedef struct mce_display_priv MceDisplayPriv;

-typedef struct mce_display {
+struct mce_display {
    GObject object;
    MceDisplayPriv* priv;
    gboolean valid;
    MCE_DISPLAY_STATE state;
-} MceDisplay;
+}; /* MceDisplay */

 typedef void
 (*MceDisplayFunc)(
@@ -92,7 +94,7 @@ mce_display_remove_handler(
 void
 mce_display_remove_handlers(
    MceDisplay* display,
-    gulong *ids,
+    gulong* ids,
    guint count);

 #define mce_display_remove_all_handlers(d, ids) \
--- a/include/mce_inactivity.h
+++ b/include/mce_inactivity.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2016 - 2023 Jolla Ltd.
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef MCE_INACTIVITY_H
+#define MCE_INACTIVITY_H
+
+#include "mce_types.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct mce_inactivity_priv MceInactivityPriv;
+
+struct mce_inactivity {
+    GObject object;
+    MceInactivityPriv* priv;
+    gboolean valid;
+    gboolean status;
+}; /* MceInactivity */
+
+typedef void
+(*MceInactivityFunc)(
+    MceInactivity* inactivity,
+    void* arg);
+
+MceInactivity*
+mce_inactivity_new(
+    void);
+
+MceInactivity*
+mce_inactivity_ref(
+    MceInactivity* inactivity);
+
+void
+mce_inactivity_unref(
+    MceInactivity* inactivity);
+
+gulong
+mce_inactivity_add_valid_changed_handler(
+    MceInactivity* inactivity,
+    MceInactivityFunc fn,
+    void* arg);
+
+gulong
+mce_inactivity_add_status_changed_handler(
+    MceInactivity* inactivity,
+    MceInactivityFunc fn,
+    void* arg);
+
+void
+mce_inactivity_remove_handler(
+    MceInactivity* inactivity,
+    gulong id);
+
+void
+mce_inactivity_remove_handlers(
+    MceInactivity* inactivity,
+    gulong* ids,
+    guint count);
+
+#define mce_inactivity_remove_all_handlers(t, ids) \
+        mce_inactivity_remove_handlers(t, ids, G_N_ELEMENTS(ids))
+
+G_END_DECLS
+
+#endif /* MCE_INACTIVITY_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--- a/include/mce_log.h
+++ b/include/mce_log.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -38,6 +38,7 @@
 #define MCE_LOG_H

 #include "mce_types.h"
+
 #include <gutil_types.h>

 G_BEGIN_DECLS
--- a/include/mce_tklock.h
+++ b/include/mce_tklock.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016-2017 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -39,6 +39,8 @@

 #include "mce_types.h"

+#include <glib-object.h>
+
 G_BEGIN_DECLS

 typedef enum mce_tklock_mode {
@@ -53,13 +55,13 @@ typedef enum mce_tklock_mode {

 typedef struct mce_tklock_priv MceTklockPriv;

-typedef struct mce_tklock {
+struct mce_tklock {
    GObject object;
    MceTklockPriv* priv;
    gboolean valid;
    MCE_TKLOCK_MODE mode;
    gboolean locked;
-} MceTklock;
+}; /* MceTklock */

 typedef void
 (*MceTklockFunc)(
@@ -104,7 +106,7 @@ mce_tklock_remove_handler(
 void
 mce_tklock_remove_handlers(
    MceTklock* tklock,
-    gulong *ids,
+    gulong* ids,
    guint count);

 #define mce_tklock_remove_all_handlers(t, ids) \
--- a/include/mce_types.h
+++ b/include/mce_types.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (c) 2016 - 2023 Jolla Ltd.
+ * Copyright (c) 2016 - 2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -38,7 +38,16 @@
 #define MCE_TYPES_H

 #include <glib.h>
-#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct mce_battery MceBattery;
+typedef struct mce_charger MceCharger;
+typedef struct mce_display MceDisplay;
+typedef struct mce_inactivity MceInactivity;
+typedef struct mce_tklock MceTklock;
+
+G_END_DECLS

 #endif /* MCE_TYPES_H */

--- a/libmce-glib.map
+++ b/libmce-glib.map
@@ -0,0 +1,6 @@
+{
+    global:
+        mce_*;
+    local:
+        *;
+};
--- a/libmce-glib.pc.in
+++ b/libmce-glib.pc.in
@@ -1,9 +1,9 @@
-libdir=/usr/lib
+libdir=@libdir@
 includedir=/usr/include

 Name: libmce-glib
 Description: MCE client library
-Version: [version]
-Requires: libglibutil glib-2.0 gio-2.0
+Version: @version@
+Requires.private: libglibutil glib-2.0 gio-2.0
 Libs: -lmce-glib
 Cflags: -I${includedir}/libmce-glib
--- a/rpm/libmce-glib.spec
+++ b/rpm/libmce-glib.spec
@@ -1,15 +1,24 @@
 Name: libmce-glib
-Version: 1.0.4
+
+Version: 1.1.0
 Release: 0
 Summary: MCE client library
-Group: Development/Libraries
 License: BSD
-URL: https://git.merproject.org/mer-core/libmce-glib
+URL: https://github.com/sailfishos/libmce-glib
 Source: %{name}-%{version}.tar.bz2
+
+%define libglibutil_version 1.0.5
+
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libglibutil)
-BuildRequires:  pkgconfig(mce)
-Requires: libglibutil >= 1.0.5
+BuildRequires: pkgconfig(libglibutil) >= %{libglibutil_version}
+BuildRequires:  pkgconfig(mce) >= 1.24.0
+
+# license macro requires rpm >= 4.11
+BuildRequires: pkgconfig(rpm)
+%define license_support %(pkg-config --exists 'rpm >= 4.11'; echo $?)
+
+Requires: libglibutil >= %{libglibutil_version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig

@@ -19,7 +28,6 @@ Provides glib-based MCE client API
 %package devel
 Summary: Development library for %{name}
 Requires: %{name} = %{version}
-Requires: pkgconfig

 %description devel
 This package contains the development library for %{name}.
@@ -28,11 +36,11 @@ This package contains the development library for %{name}.
 %setup -q

 %build
-make KEEP_SYMBOLS=1 release pkgconfig
+make %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig

 %install
 rm -rf %{buildroot}
-make install-dev DESTDIR=%{buildroot}
+make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev

 %post -p /sbin/ldconfig

@@ -41,6 +49,9 @@ make install-dev DESTDIR=%{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so.*
+%if %{license_support} == 0
+%license LICENSE
+%endif

 %files devel
 %defattr(-,root,root,-)
--- a/spec/org.freedesktop.UPower.Device.xml
+++ b/spec/org.freedesktop.UPower.Device.xml
@@ -0,0 +1,833 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" [
+  <!ENTITY ERROR_GENERAL "org.freedesktop.UPower.Device.GeneralError">
+]>
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="org.freedesktop.UPower.Device">
+    <doc:doc>
+      <doc:description>
+        <doc:para>
+          Objects implementing this interface are usually discovered through
+          the <doc:tt>org.freedesktop.UPower</doc:tt> interface on
+          the <doc:tt>/org/freedesktop/UPower</doc:tt> object on
+          the D-Bus system bus service with the well-known
+          name <doc:tt>org.freedesktop.UPower</doc:tt> using
+          the
+          <doc:ref type="method" to="Power.EnumerateDevices">EnumerateDevices</doc:ref>
+          method.
+        </doc:para>
+        <doc:para>
+          <doc:example language="shell" title="simple example">
+            <doc:code>
+$ dbus-send --print-reply \
+            --system \
+            --dest=org.freedesktop.UPower \
+            /org/freedesktop/UPower/devices/battery_BAT0 \
+            org.freedesktop.DBus.Properties.GetAll \
+            string:org.freedesktop.UPower.Device
+
+method return sender=:1.386 -> dest=:1.477 reply_serial=2
+   array [
+      dict entry(
+         string "native-path"
+         variant             string "/sys/devices/LNXSYSTM:00/device:00/PNP0A08:00/device:01/PNP0C09:00/PNP0C0A:00/power_supply/BAT0"
+      )
+      dict entry(
+         string "vendor"
+         variant             string "SONY"
+      )
+      dict entry(
+         string "model"
+         variant             string "42T4568"
+      )
+      dict entry(
+         string "serial"
+         variant             string "4179"
+      )
+      dict entry(
+         string "update-time"
+         variant             uint64 1226417875
+      )
+      dict entry(
+         string "type"
+         variant             uint 2
+      )
+      dict entry(
+         string "power-supply"
+         variant             boolean true
+      )
+      dict entry(
+         string "has-history"
+         variant             boolean true
+      )
+      dict entry(
+         string "has-statistics"
+         variant             boolean true
+      )
+      dict entry(
+         string "online"
+         variant             boolean false
+      )
+      dict entry(
+         string "energy"
+         variant             double 72.85
+      )
+      dict entry(
+         string "energy-empty"
+         variant             double 0
+      )
+      dict entry(
+         string "energy-full"
+         variant             double 74.55
+      )
+      dict entry(
+         string "energy-full-design"
+         variant             double 74.88
+      )
+      dict entry(
+         string "energy-rate"
+         variant             double 0
+      )
+      dict entry(
+         string "voltage"
+         variant             double 16.415
+      )
+      dict entry(
+         string "time-to-empty"
+         variant             int64 0
+      )
+      dict entry(
+         string "time-to-full"
+         variant             int64 0
+      )
+      dict entry(
+         string "percentage"
+         variant             double 97.7197
+      )
+      dict entry(
+         string "is-present"
+         variant             boolean true
+      )
+      dict entry(
+         string "state"
+         variant             uint 3
+      )
+      dict entry(
+         string "is-rechargeable"
+         variant             boolean true
+      )
+      dict entry(
+         string "capacity"
+         variant             double 100
+      )
+      dict entry(
+         string "technology"
+         variant             uint 1
+      )
+   ]
+            </doc:code>
+          </doc:example>
+        </doc:para>
+        <doc:para>
+          Unless otherwise noted, an empty string or the value 0 in a
+          property on this interface means not set.
+        </doc:para>
+      </doc:description>
+    </doc:doc>
+
+
+    <!-- ************************************************************ -->
+    <method name="Refresh">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Refreshes the data collected from the power source.
+          </doc:para>
+        </doc:description>
+        <doc:permission>Callers will need to make sure that the daemon was started in debug mode</doc:permission>
+        <doc:errors>
+          <doc:error name="&ERROR_GENERAL;">if an error occured while refreshing</doc:error>
+        </doc:errors>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+    <method name="GetHistory">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="type" direction="in" type="s">
+        <doc:doc><doc:summary>The type of history.
+        Valid types are <doc:tt>rate</doc:tt> or <doc:tt>charge</doc:tt>.</doc:summary></doc:doc>
+      </arg>
+      <arg name="timespan" direction="in" type="u">
+        <doc:doc><doc:summary>The amount of data to return in seconds, or 0 for all.</doc:summary></doc:doc>
+      </arg>
+      <arg name="resolution" direction="in" type="u">
+        <doc:doc>
+          <doc:summary>
+            The approximate number of points to return.
+            A higher resolution is more accurate, at the expense of plotting speed.
+          </doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="data" direction="out" type="a(udu)">
+        <doc:doc><doc:summary>
+            The history data for the power device, if the device supports history.
+            Data is ordered from the earliest in time, to the newest data point.
+            Each element contains the following members:
+            <doc:list>
+              <doc:item>
+                <doc:term>time</doc:term>
+                <doc:definition>
+                  The time value in seconds from the <doc:tt>gettimeofday()</doc:tt> method.
+                </doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>value</doc:term>
+                <doc:definition>
+                  The data value, for instance the rate in W or the charge in %.
+                </doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>state</doc:term>
+                <doc:definition>
+                  The state of the device, for instance <doc:tt>charging</doc:tt> or
+                  <doc:tt>discharging</doc:tt>.
+                </doc:definition>
+              </doc:item>
+            </doc:list>
+        </doc:summary></doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Gets history for the power device that is persistent across reboots.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+    <method name="GetStatistics">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="type" direction="in" type="s">
+        <doc:doc><doc:summary>The mode for the statistics.
+        Valid types are <doc:tt>charging</doc:tt> or <doc:tt>discharging</doc:tt>.</doc:summary></doc:doc>
+      </arg>
+      <arg name="data" direction="out" type="a(dd)">
+        <doc:doc><doc:summary>
+            The statistics data for the power device.
+            Each element contains the following members:
+            <doc:list>
+              <doc:item>
+                <doc:term>value</doc:term>
+                <doc:definition>
+                  The value of the percentage point, usually in seconds
+                </doc:definition>
+              </doc:item>
+              <doc:item>
+                <doc:term>accuracy</doc:term>
+                <doc:definition>
+                  The accuracy of the prediction in percent.
+                </doc:definition>
+              </doc:item>
+            </doc:list>
+        </doc:summary></doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Gets statistics for the power device that may be interesting
+            to show on a graph in the session.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <!-- ************************************************************ -->
+    <property name="NativePath" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            OS specific native path of the power source. On Linux this
+            is the sysfs path, for
+            example <doc:tt>/sys/devices/LNXSYSTM:00/device:00/PNP0C0A:00/power_supply/BAT0</doc:tt>. Is
+            blank if the device is being driven by a user space
+            driver.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Vendor" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Name of the vendor of the battery.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Model" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Name of the model of this battery.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Serial" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Unique serial number of the battery.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="UpdateTime" type="t" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The point in time (seconds since the Epoch Jan 1, 1970
+            0:00 UTC) that data was read from the power source.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Type" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Type of power source.
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>Unknown</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>Line Power</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>Battery</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>Ups</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>Monitor</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>5</doc:term><doc:definition>Mouse</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>6</doc:term><doc:definition>Keyboard</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>7</doc:term><doc:definition>Pda</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>8</doc:term><doc:definition>Phone</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>9</doc:term><doc:definition>Media Player</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>10</doc:term><doc:definition>Tablet</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>11</doc:term><doc:definition>Computer</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>12</doc:term><doc:definition>Gaming Input</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>13</doc:term><doc:definition>Pen</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>14</doc:term><doc:definition>Touchpad</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>15</doc:term><doc:definition>Modem</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>16</doc:term><doc:definition>Network</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>17</doc:term><doc:definition>Headset</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>18</doc:term><doc:definition>Speakers</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>19</doc:term><doc:definition>Headphones</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>20</doc:term><doc:definition>Video</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>21</doc:term><doc:definition>Other Audio</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>22</doc:term><doc:definition>Remote Control</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>23</doc:term><doc:definition>Printer</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>24</doc:term><doc:definition>Scanner</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>25</doc:term><doc:definition>Camera</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>26</doc:term><doc:definition>Wearable</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>27</doc:term><doc:definition>Toy</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>28</doc:term><doc:definition>Bluetooth Genreic</doc:definition>
+            </doc:item>
+          </doc:list>
+          <doc:para>
+            If the value is set to "Battery", you will need to verify that the
+            property <doc:ref type="property" to="Source:PowerSupply">power-supply</doc:ref>
+            has the value "true" before considering it as a laptop battery. Otherwise it
+            will likely be the battery for a device of an unknown type.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="PowerSupply" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            If the power device is used to supply the system.
+            This would be set TRUE for laptop batteries and UPS devices,
+            but set FALSE for wireless mice or PDAs.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="HasHistory" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            If the power device has history.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="HasStatistics" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            If the power device has statistics.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Online" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Whether power is currently being provided through line power.
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "line-power".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Energy" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Amount of energy (measured in Wh) currently available in
+            the power source.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="EnergyEmpty" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Amount of energy (measured in Wh) in the power source when
+            it's considered to be empty.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="EnergyFull" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Amount of energy (measured in Wh) in the power source when
+            it's considered full.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="EnergyFullDesign" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Amount of energy (measured in Wh) the power source is
+            designed to hold when it's considered full.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="EnergyRate" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Amount of energy being drained from the source, measured
+            in W. If positive, the source is being discharged, if
+            negative it's being charged.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Voltage" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Voltage in the Cell or being recorded by the meter.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="ChargeCycles" type="i" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The number of charge cycles as defined by the TCO certification, or -1 if
+            that value is unknown or not applicable.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Luminosity" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Luminosity being recorded by the meter.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="TimeToEmpty" type="x" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Number of seconds until the power source is considered empty.
+            Is set to 0 if unknown.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="TimeToFull" type="x" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Number of seconds until the power source is considered full.
+            Is set to 0 if unknown.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Percentage" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The amount of energy left in the power source expressed as
+            a percentage between 0 and 100. Typically this is the same as
+            (<doc:ref type="property" to="Source:Energy">energy</doc:ref> -
+            <doc:ref type="property" to="Source:EnergyEmpty">energy-empty</doc:ref>) /
+            (<doc:ref type="property" to="Source:EnergyFull">energy-full</doc:ref> -
+            <doc:ref type="property" to="Source:EnergyEmpty">energy-empty</doc:ref>).
+            However, some primitive power sources are capable of only
+            reporting percentages and in this case the energy-*
+            properties will be unset while this property is set.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+          <doc:para>
+            The percentage will be an approximation if the <doc:ref type="property" to="BatteryLevel">battery level</doc:ref>
+            is set to something other than None. The percentage is kept for compatibility reasons.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Temperature" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The temperature of the device in degrees Celsius. This property is
+            only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="IsPresent" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            If the power source is present in the bay.
+            This field is required as some batteries are hot-removable, for example
+            expensive UPS and most laptop batteries.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="State" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The battery power state.
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>Unknown</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>Charging</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>Discharging</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>Empty</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>Fully charged</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>5</doc:term><doc:definition>Pending charge</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>6</doc:term><doc:definition>Pending discharge</doc:definition>
+            </doc:item>
+          </doc:list>
+          <doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="IsRechargeable" type="b" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            If the power source is rechargeable.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Capacity" type="d" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The capacity of the power source expressed as a percentage between 0 and 100.
+            The capacity of the battery will reduce with age.
+            A capacity value less than 75% is usually a sign that you should renew your battery.
+            Typically this value is the same as
+            (<doc:ref type="property" to="Source:FullDesign">full-design</doc:ref> /
+            <doc:ref type="property" to="Source:Full">full</doc:ref>) * 100.
+            However, some primitive power sources are not capable reporting capacity
+            and in this case the capacity property will be unset.
+          </doc:para><doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="Technology" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Technology used in the battery:
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>Unknown</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>Lithium ion</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>Lithium polymer</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>Lithium iron phosphate</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>Lead acid</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>5</doc:term><doc:definition>Nickel cadmium</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>6</doc:term><doc:definition>Nickel metal hydride</doc:definition>
+            </doc:item>
+          </doc:list>
+          <doc:para>
+            This property is only valid if the property
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
+            has the value "battery".
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="WarningLevel" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Warning level of the battery:
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>Unknown</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>None</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>2</doc:term><doc:definition>Discharging (only for UPSes)</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>Low</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>Critical</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>5</doc:term><doc:definition>Action</doc:definition>
+            </doc:item>
+          </doc:list>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="BatteryLevel" type="u" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            The level of the battery for devices which do not report a percentage but rather a coarse battery level. If the value
+            is None, then the device does not support coarse battery reporting, and the percentage should be used instead.
+          </doc:para>
+          <doc:list>
+            <doc:item>
+              <doc:term>0</doc:term><doc:definition>Unknown</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>1</doc:term><doc:definition>None (the battery does not use a coarse level of battery reporting)</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>3</doc:term><doc:definition>Low</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>4</doc:term><doc:definition>Critical</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>6</doc:term><doc:definition>Normal</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>7</doc:term><doc:definition>High</doc:definition>
+            </doc:item>
+            <doc:item>
+              <doc:term>8</doc:term><doc:definition>Full</doc:definition>
+            </doc:item>
+          </doc:list>
+        </doc:description>
+      </doc:doc>
+    </property>
+
+    <property name="IconName" type="s" access="read">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            <p>An icon name, following the <a href="http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html">Icon Naming Specification</a></p>
+            <p>Note that the icons might not match end-user expectations in terms of presentation relative to the amount of battery left or perceived to be left. It is recommended that front-ends use the BatteryLevel property first, if available, followed by the Percentage, to present a more realistic battery level to the user.</p>
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+  </interface>
+
+</node>
--- a/src/mce_battery.c
+++ b/src/mce_battery.c
@@ -0,0 +1,385 @@
+/*
+ * Copyright (C) 2019-2022 Jolla Ltd.
+ * Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#include "mce_battery.h"
+#include "mce_proxy.h"
+#include "mce_log_p.h"
+
+#include <gutil_misc.h>
+
+/* Generated headers */
+#include "org.freedesktop.UPower.Device.h"
+
+#define MCE_BATTERY_STATUS_OK "ok"
+#define MCE_BATTERY_STATUS_LOW "low"
+#define MCE_BATTERY_STATUS_EMPTY "very_low"
+#define MCE_BATTERY_STATUS_CRITICAL "critical"
+#define MCE_BATTERY_STATUS_UNKNOWN "unknown"
+
+enum mce_battery_ind {
+    BATTERY_IND_LEVEL,
+    BATTERY_IND_STATUS,
+    BATTERY_IND_COUNT
+};
+
+typedef enum mce_battery_flags {
+    BATTERY_HAVE_NONE = 0x00,
+    BATTERY_HAVE_LEVEL = 0x01,
+    BATTERY_HAVE_STATUS = 0x02
+} BATTERY_FLAGS;
+
+#define BATTERY_HAVE_ALL (BATTERY_HAVE_LEVEL | BATTERY_HAVE_STATUS)
+
+struct mce_battery_priv {
+    MceProxy* proxy;
+    BATTERY_FLAGS flags;
+    gulong proxy_valid_id;
+    gulong battery_ind_id;
+};
+
+enum mce_battery_signal {
+    SIGNAL_VALID_CHANGED,
+    SIGNAL_LEVEL_CHANGED,
+    SIGNAL_STATUS_CHANGED,
+    SIGNAL_COUNT
+};
+
+#define SIGNAL_VALID_CHANGED_NAME   "mce-battery-valid-changed"
+#define SIGNAL_LEVEL_CHANGED_NAME   "mce-battery-level-changed"
+#define SIGNAL_STATUS_CHANGED_NAME  "mce-battery-status-changed"
+
+static guint mce_battery_signals[SIGNAL_COUNT] = { 0 };
+
+typedef GObjectClass MceBatteryClass;
+G_DEFINE_TYPE(MceBattery, mce_battery, G_TYPE_OBJECT)
+#define PARENT_CLASS mce_battery_parent_class
+#define MCE_BATTERY_TYPE (mce_battery_get_type())
+#define MCE_BATTERY(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,\
+        MCE_BATTERY_TYPE,MceBattery))
+
+/*==========================================================================*
+ * Implementation
+ *==========================================================================*/
+
+static
+void
+mce_battery_check_valid(
+    MceBattery* self)
+{
+    MceBatteryPriv* priv = self->priv;
+    const gboolean valid = priv->proxy->valid &&
+        (priv->flags & BATTERY_HAVE_ALL) == BATTERY_HAVE_ALL;
+
+    if (valid != self->valid) {
+        self->valid = valid;
+        g_signal_emit(self, mce_battery_signals[SIGNAL_VALID_CHANGED], 0);
+    }
+}
+
+static
+void
+mce_battery_status_update(
+    MceBattery* self,
+    const char* status)
+{
+    MceBatteryPriv* priv = self->priv;
+    MCE_BATTERY_STATUS new_status;
+
+    if (!g_strcmp0(status, MCE_BATTERY_STATUS_OK)) {
+        new_status = MCE_BATTERY_OK;
+    } else if (!g_strcmp0(status, MCE_BATTERY_STATUS_LOW)) {
+        new_status = MCE_BATTERY_LOW;
+    } else if (!g_strcmp0(status, MCE_BATTERY_STATUS_EMPTY)) {
+        new_status = MCE_BATTERY_LOW;
+    } else if (!g_strcmp0(status, MCE_BATTERY_STATUS_CRITICAL)) {
+        new_status = MCE_BATTERY_EMPTY;
+    } else {
+        GASSERT(!g_strcmp0(status, MCE_BATTERY_STATUS_UNKNOWN));
+        new_status = MCE_BATTERY_UNKNOWN;
+    }
+    if (self->status != new_status) {
+        self->status = new_status;
+        g_signal_emit(self, mce_battery_signals[SIGNAL_STATUS_CHANGED], 0);
+    }
+    priv->flags |= BATTERY_HAVE_STATUS;
+    mce_battery_check_valid(self);
+}
+
+static
+void
+mce_battery_level_update(
+    MceBattery* self,
+    gdouble level)
+{
+    // values from ayatana-indicator-power/src/notifier.c
+    char* status;
+    if (level <= 2)
+        status = MCE_BATTERY_STATUS_CRITICAL;
+    else if (level <= 5)
+        status = MCE_BATTERY_STATUS_EMPTY;
+    else if (level <= 10)
+        status = MCE_BATTERY_STATUS_LOW;
+    else
+        status = MCE_BATTERY_STATUS_OK;
+    mce_battery_status_update(self, status);
+
+    MceBatteryPriv* priv = self->priv;
+    const guint new_level = (level < 0) ? 0 : (level > 100) ? 100 : level;
+
+    if (self->level != new_level) {
+        self->level = new_level;
+        g_signal_emit(self, mce_battery_signals[SIGNAL_LEVEL_CHANGED], 0);
+    }
+    priv->flags |= BATTERY_HAVE_LEVEL;
+    mce_battery_check_valid(self);
+}
+
+static void
+on_properties_changed (GDBusProxy          *proxy,
+                       GVariant            *changed_properties,
+                       const gchar* const  *invalidated_properties,
+                       gpointer             user_data)
+{
+  GVariantIter iter;
+  const gchar *key;
+  GVariant *value;
+
+  g_variant_iter_init (&iter, changed_properties);
+  while (g_variant_iter_next (&iter, "{&sv}", &key, &value))
+    {
+        if (!g_strcmp0(key, "Percentage")) {
+            gdouble level;
+            g_variant_get (value, "d", &level);
+            mce_battery_level_update(MCE_BATTERY(user_data), level);
+        }
+
+      g_variant_unref (value);
+    }
+}
+
+static
+void
+mce_battery_query(
+    MceBattery* self)
+{
+    MceBatteryPriv* priv = self->priv;
+    MceProxy* proxy = priv->proxy;
+
+    /*
+     * proxy->signal and proxy->request may not be available at the
+     * time when MceBattery is created. In that case we have to wait
+     * for the valid signal before we can connect the battery state
+     * signal and submit the initial query.
+     */
+    if (proxy->upower_request && !priv->battery_ind_id) {
+        priv->battery_ind_id = g_signal_connect(proxy->upower_request, "g-properties-changed",
+            G_CALLBACK(on_properties_changed), self);
+    }
+
+    if (proxy->upower_request && proxy->valid) {
+        gdouble level = org_freedesktop_upower_device_get_percentage(proxy->upower_request);
+        mce_battery_level_update(self, level);
+    }
+}
+
+static
+void
+mce_battery_valid_changed(
+    MceProxy* proxy,
+    void* arg)
+{
+    MceBattery* self = MCE_BATTERY(arg);
+    MceBatteryPriv* priv = self->priv;
+
+    if (proxy->valid) {
+        mce_battery_query(self);
+    } else {
+        priv->flags = BATTERY_HAVE_NONE;
+    }
+    mce_battery_check_valid(self);
+}
+
+/*==========================================================================*
+ * API
+ *==========================================================================*/
+
+MceBattery*
+mce_battery_new()
+{
+    /* MCE assumes one battery */
+    static MceBattery* mce_battery_instance = NULL;
+
+    if (mce_battery_instance) {
+        mce_battery_ref(mce_battery_instance);
+    } else {
+        mce_battery_instance = g_object_new(MCE_BATTERY_TYPE, NULL);
+        mce_battery_query(mce_battery_instance);
+        g_object_add_weak_pointer(G_OBJECT(mce_battery_instance),
+            (gpointer*)(&mce_battery_instance));
+    }
+    return mce_battery_instance;
+}
+
+MceBattery*
+mce_battery_ref(
+    MceBattery* self)
+{
+    if (G_LIKELY(self)) {
+        g_object_ref(MCE_BATTERY(self));
+    }
+    return self;
+}
+
+void
+mce_battery_unref(
+    MceBattery* self)
+{
+    if (G_LIKELY(self)) {
+        g_object_unref(MCE_BATTERY(self));
+    }
+}
+
+gulong
+mce_battery_add_valid_changed_handler(
+    MceBattery* self,
+    MceBatteryFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_VALID_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+gulong
+mce_battery_add_level_changed_handler(
+    MceBattery* self,
+    MceBatteryFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_LEVEL_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+gulong
+mce_battery_add_status_changed_handler(
+    MceBattery* self,
+    MceBatteryFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_STATUS_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+void
+mce_battery_remove_handler(
+    MceBattery* self,
+    gulong id)
+{
+    if (G_LIKELY(self) && G_LIKELY(id)) {
+        g_signal_handler_disconnect(self, id);
+    }
+}
+
+void
+mce_battery_remove_handlers(
+    MceBattery* self,
+    gulong* ids,
+    guint count)
+{
+    gutil_disconnect_handlers(self, ids, count);
+}
+
+/*==========================================================================*
+ * Internals
+ *==========================================================================*/
+
+static
+void
+mce_battery_init(
+    MceBattery* self)
+{
+    MceBatteryPriv* priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCE_BATTERY_TYPE,
+        MceBatteryPriv);
+
+    self->priv = priv;
+    priv->proxy = mce_proxy_new();
+    priv->proxy_valid_id = mce_proxy_add_valid_changed_handler(priv->proxy,
+        mce_battery_valid_changed, self);
+}
+
+static
+void
+mce_battery_finalize(
+    GObject* object)
+{
+    MceBattery* self = MCE_BATTERY(object);
+    MceBatteryPriv* priv = self->priv;
+
+    mce_proxy_remove_handler(priv->proxy, priv->battery_ind_id);
+    mce_proxy_remove_handler(priv->proxy, priv->proxy_valid_id);
+    mce_proxy_unref(priv->proxy);
+    G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
+}
+
+static
+void
+mce_battery_class_init(
+    MceBatteryClass* klass)
+{
+    GObjectClass* object_class = G_OBJECT_CLASS(klass);
+
+    object_class->finalize = mce_battery_finalize;
+    g_type_class_add_private(klass, sizeof(MceBatteryPriv));
+    mce_battery_signals[SIGNAL_VALID_CHANGED] =
+        g_signal_new(SIGNAL_VALID_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+    mce_battery_signals[SIGNAL_LEVEL_CHANGED] =
+        g_signal_new(SIGNAL_LEVEL_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+    mce_battery_signals[SIGNAL_STATUS_CHANGED] =
+        g_signal_new(SIGNAL_STATUS_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--- a/src/mce_charger.c
+++ b/src/mce_charger.c
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2019-2022 Jolla Ltd.
+ * Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#include "mce_charger.h"
+#include "mce_proxy.h"
+#include "mce_log_p.h"
+
+#include <gutil_misc.h>
+
+#define MCE_CHARGER_STATE_ON        "on"
+#define MCE_CHARGER_STATE_OFF       "off"
+#define MCE_CHARGER_STATE_UNKNOWN   "unknown"
+
+/* Generated headers */
+#include "org.freedesktop.UPower.Device.h"
+
+enum upower_state {
+    UPOWER_STATE_UNKNOWN,
+    UPOWER_STATE_CHARGING,
+    UPOWER_STATE_DISCHARGING,
+    UPOWER_STATE_EMPTY,
+    UPOWER_STATE_FULLY_CHARGED,
+    UPOWER_STATE_PENDING_CHARGE,
+    UPOWER_STATE_PENDING_DISCHARGE,
+    UPOWER_STATE_COUNT
+};
+
+struct mce_charger_priv {
+    MceProxy* proxy;
+    gulong proxy_valid_id;
+    gulong charger_state_ind_id;
+};
+
+enum mce_charger_signal {
+    SIGNAL_VALID_CHANGED,
+    SIGNAL_STATE_CHANGED,
+    SIGNAL_COUNT
+};
+
+#define SIGNAL_VALID_CHANGED_NAME   "mce-charger-valid-changed"
+#define SIGNAL_STATE_CHANGED_NAME   "mce-charger-state-changed"
+
+static guint mce_charger_signals[SIGNAL_COUNT] = { 0 };
+
+typedef GObjectClass MceChargerClass;
+G_DEFINE_TYPE(MceCharger, mce_charger, G_TYPE_OBJECT)
+#define PARENT_CLASS mce_charger_parent_class
+#define MCE_CHARGER_TYPE (mce_charger_get_type())
+#define MCE_CHARGER(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,\
+        MCE_CHARGER_TYPE,MceCharger))
+
+/*==========================================================================*
+ * Implementation
+ *==========================================================================*/
+
+static
+void
+mce_charger_state_update(
+    MceCharger* self,
+    const char* value)
+{
+    MCE_CHARGER_STATE state;
+    MceChargerPriv* priv = self->priv;
+
+    if (!g_strcmp0(value, MCE_CHARGER_STATE_ON)) {
+        state = MCE_CHARGER_ON;
+    } else if (!g_strcmp0(value, MCE_CHARGER_STATE_OFF)) {
+        state = MCE_CHARGER_OFF;
+    } else {
+        GASSERT(!g_strcmp0(value, MCE_CHARGER_STATE_UNKNOWN));
+        state = MCE_CHARGER_UNKNOWN;
+    }
+    if (self->state != state) {
+        self->state = state;
+        g_signal_emit(self, mce_charger_signals[SIGNAL_STATE_CHANGED], 0);
+    }
+    if (priv->proxy->valid && !self->valid) {
+        self->valid = TRUE;
+        g_signal_emit(self, mce_charger_signals[SIGNAL_VALID_CHANGED], 0);
+    }
+}
+
+static void
+mce_charger_update_charging_state (
+    MceCharger* self,
+    enum upower_state state)
+{
+    gboolean discharging;
+    switch (state) {
+      case UPOWER_STATE_CHARGING:
+      case UPOWER_STATE_FULLY_CHARGED:
+        discharging = 0;
+        break;
+      default:
+        discharging = 1;
+        break;
+    }
+    mce_charger_state_update(self, discharging ? MCE_CHARGER_STATE_OFF : MCE_CHARGER_STATE_ON);
+}
+
+static void
+on_properties_changed (GDBusProxy          *proxy,
+                       GVariant            *changed_properties,
+                       const gchar* const  *invalidated_properties,
+                       gpointer             user_data)
+{
+  GVariantIter iter;
+  const gchar *key;
+  GVariant *value;
+
+  g_variant_iter_init (&iter, changed_properties);
+  while (g_variant_iter_next (&iter, "{&sv}", &key, &value))
+    {
+        if (!g_strcmp0(key, "State")) {
+            enum upower_state state;
+            g_variant_get (value, "u", &state);
+            mce_charger_update_charging_state(MCE_CHARGER(user_data), state);
+        }
+
+      g_variant_unref (value);
+    }
+}
+
+static
+void
+mce_charger_state_query(
+    MceCharger* self)
+{
+    MceChargerPriv* priv = self->priv;
+    MceProxy* proxy = priv->proxy;
+
+    /*
+     * proxy->signal and proxy->request may not be available at the
+     * time when MceCharger is created. In that case we have to wait
+     * for the valid signal before we can connect the charger state
+     * signal and submit the initial query.
+     */
+    if (proxy->upower_request && !priv->charger_state_ind_id) {
+        priv->charger_state_ind_id = g_signal_connect(proxy->upower_request, "g-properties-changed",
+                G_CALLBACK(on_properties_changed), self);
+    }
+
+    if (proxy->upower_request && proxy->valid) {
+        enum upower_state state = org_freedesktop_upower_device_get_state(proxy->upower_request);
+        mce_charger_update_charging_state(self, state);
+    }
+}
+
+static
+void
+mce_charger_valid_changed(
+    MceProxy* proxy,
+    void* arg)
+{
+    MceCharger* self = MCE_CHARGER(arg);
+
+    if (proxy->valid) {
+        mce_charger_state_query(self);
+    } else {
+        if (self->valid) {
+            self->valid = FALSE;
+            g_signal_emit(self, mce_charger_signals[SIGNAL_VALID_CHANGED], 0);
+        }
+    }
+}
+
+/*==========================================================================*
+ * API
+ *==========================================================================*/
+
+MceCharger*
+mce_charger_new()
+{
+    /* MCE assumes one charger */
+    static MceCharger* mce_charger_instance = NULL;
+
+    if (mce_charger_instance) {
+        mce_charger_ref(mce_charger_instance);
+    } else {
+        mce_charger_instance = g_object_new(MCE_CHARGER_TYPE, NULL);
+        mce_charger_state_query(mce_charger_instance);
+        g_object_add_weak_pointer(G_OBJECT(mce_charger_instance),
+            (gpointer*)(&mce_charger_instance));
+    }
+    return mce_charger_instance;
+}
+
+MceCharger*
+mce_charger_ref(
+    MceCharger* self)
+{
+    if (G_LIKELY(self)) {
+        g_object_ref(MCE_CHARGER(self));
+    }
+    return self;
+}
+
+void
+mce_charger_unref(
+    MceCharger* self)
+{
+    if (G_LIKELY(self)) {
+        g_object_unref(MCE_CHARGER(self));
+    }
+}
+
+gulong
+mce_charger_add_valid_changed_handler(
+    MceCharger* self,
+    MceChargerFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_VALID_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+gulong
+mce_charger_add_state_changed_handler(
+    MceCharger* self,
+    MceChargerFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_STATE_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+void
+mce_charger_remove_handler(
+    MceCharger* self,
+    gulong id)
+{
+    if (G_LIKELY(self) && G_LIKELY(id)) {
+        g_signal_handler_disconnect(self, id);
+    }
+}
+
+void
+mce_charger_remove_handlers(
+    MceCharger* self,
+    gulong* ids,
+    guint count)
+{
+    gutil_disconnect_handlers(self, ids, count);
+}
+
+/*==========================================================================*
+ * Internals
+ *==========================================================================*/
+
+static
+void
+mce_charger_init(
+    MceCharger* self)
+{
+    MceChargerPriv* priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCE_CHARGER_TYPE,
+        MceChargerPriv);
+
+    self->priv = priv;
+    priv->proxy = mce_proxy_new();
+    priv->proxy_valid_id = mce_proxy_add_valid_changed_handler(priv->proxy,
+        mce_charger_valid_changed, self);
+}
+
+static
+void
+mce_charger_finalize(
+    GObject* object)
+{
+    MceCharger* self = MCE_CHARGER(object);
+    MceChargerPriv* priv = self->priv;
+
+    if (priv->charger_state_ind_id) {
+        g_signal_handler_disconnect(priv->proxy->upower_request,
+            priv->charger_state_ind_id);
+    }
+    mce_proxy_remove_handler(priv->proxy, priv->proxy_valid_id);
+    mce_proxy_unref(priv->proxy);
+    G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
+}
+
+static
+void
+mce_charger_class_init(
+    MceChargerClass* klass)
+{
+    GObjectClass* object_class = G_OBJECT_CLASS(klass);
+
+    object_class->finalize = mce_charger_finalize;
+    g_type_class_add_private(klass, sizeof(MceChargerPriv));
+    mce_charger_signals[SIGNAL_VALID_CHANGED] =
+        g_signal_new(SIGNAL_VALID_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+    mce_charger_signals[SIGNAL_STATE_CHANGED] =
+        g_signal_new(SIGNAL_STATE_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--- a/src/mce_display.c
+++ b/src/mce_display.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -61,7 +61,7 @@ enum mce_display_signal {
 #define MCE_DISPLAY_OFF_STRING "off"
 #define MCE_DISPLAY_ON_STRING "on"

-#define MCE_DISPLAY_SIG "DisplayPowerStateChange"
+#define MCE_DISPLAY_SIG "display-power-state-change"

 static guint mce_display_signals[SIGNAL_COUNT] = { 0 };

@@ -128,6 +128,7 @@ void
 mce_display_power_state_change(
    ComCanonicalUnityScreen* proxy,
    int32_t status,
+    int32_t reason,
    gpointer arg)
 {
    GDEBUG("Display is %d", status);
@@ -148,12 +149,12 @@ mce_display_status_query(
     * for the valid signal before we can connect the display state
     * signal and submit the initial query.
     */
-    if (proxy->signal && !priv->display_status_ind_id) {
-        priv->display_status_ind_id = g_signal_connect(proxy->signal,
+    if (proxy->unity_request && !priv->display_status_ind_id) {
+        priv->display_status_ind_id = g_signal_connect(proxy->unity_request,
            MCE_DISPLAY_SIG, G_CALLBACK(mce_display_power_state_change), self);
    }
-    if (proxy->request && proxy->valid) {
-        com_canonical_unity_screen_call_get_display_power_state(proxy->request, NULL,
+    if (proxy->unity_request && proxy->valid) {
+        com_canonical_unity_screen_call_get_display_power_state(proxy->unity_request, NULL,
            mce_display_status_query_done, mce_display_ref(self));
    }
 }
@@ -249,7 +250,7 @@ mce_display_remove_handler(
 void
 mce_display_remove_handlers(
    MceDisplay* self,
-    gulong *ids,
+    gulong* ids,
    guint count)
 {
    gutil_disconnect_handlers(self, ids, count);
@@ -282,7 +283,7 @@ mce_display_finalize(
    MceDisplayPriv* priv = self->priv;

    if (priv->display_status_ind_id) {
-        g_signal_handler_disconnect(priv->proxy->signal,
+        g_signal_handler_disconnect(priv->proxy->unity_request,
            priv->display_status_ind_id);
    }
    mce_proxy_remove_handler(priv->proxy, priv->proxy_valid_id);
--- a/src/mce_inactivity.c
+++ b/src/mce_inactivity.c
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2016 - 2023 Jolla Ltd.
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#include "mce_inactivity.h"
+#include "mce_proxy.h"
+#include "mce_log_p.h"
+
+#include <mce/dbus-names.h>
+#include <mce/mode-names.h>
+
+#include <gutil_misc.h>
+
+/* Generated headers */
+#include "com.nokia.mce.request.h"
+#include "com.nokia.mce.signal.h"
+
+struct mce_inactivity_priv {
+    MceProxy* proxy;
+    gulong proxy_valid_id;
+    gulong inactivity_status_ind_id;
+};
+
+enum mce_inactivity_signal {
+    SIGNAL_VALID_CHANGED,
+    SIGNAL_STATUS_CHANGED,
+    SIGNAL_COUNT
+};
+
+#define SIGNAL_VALID_CHANGED_NAME  "mce-inactivity-valid-changed"
+#define SIGNAL_STATUS_CHANGED_NAME "mce-inactivity-mode-changed"
+
+static guint mce_inactivity_signals[SIGNAL_COUNT] = { 0 };
+
+typedef GObjectClass MceInactivityClass;
+G_DEFINE_TYPE(MceInactivity, mce_inactivity, G_TYPE_OBJECT)
+#define PARENT_CLASS mce_inactivity_parent_class
+#define MCE_INACTIVITY_TYPE (mce_inactivity_get_type())
+#define MCE_INACTIVITY(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj,\
+        MCE_INACTIVITY_TYPE,MceInactivity))
+
+/*==========================================================================*
+ * Implementation
+ *==========================================================================*/
+
+static
+void
+mce_inactivity_status_update(
+    MceInactivity* self,
+    gboolean status)
+{
+    MceInactivityPriv* priv = self->priv;
+    const gboolean prev_status = self->status;
+    self->status = status;
+    if (self->status != prev_status) {
+        g_signal_emit(self, mce_inactivity_signals[SIGNAL_STATUS_CHANGED], 0);
+    }
+    if (priv->proxy->valid && !self->valid) {
+        self->valid = TRUE;
+        g_signal_emit(self, mce_inactivity_signals[SIGNAL_VALID_CHANGED], 0);
+    }
+}
+
+static
+void
+mce_inactivity_status_query_done(
+    GObject* proxy,
+    GAsyncResult* result,
+    gpointer arg)
+{
+    GError* error = NULL;
+    gboolean status = FALSE;
+    MceInactivity* self = MCE_INACTIVITY(arg);
+
+    if (com_nokia_mce_request_call_get_inactivity_status_finish(
+        COM_NOKIA_MCE_REQUEST(proxy), &status, result, &error)) {
+        GDEBUG("inactivlty is currently %s", status ? "true" : "false");
+        mce_inactivity_status_update(self, status);
+    } else {
+        /*
+         * We could retry but it's probably not worth the trouble.
+         * There is signal broadcast on mce startup / when inactivity
+         * state changes.
+         * Until then, this object stays invalid.
+         */
+        GWARN("Failed to query inactivity status %s", GERRMSG(error));
+        g_error_free(error);
+    }
+    mce_inactivity_unref(self);
+}
+
+static
+void
+mce_inactivity_status_ind(
+    ComNokiaMceSignal* proxy,
+    gboolean status,
+    gpointer arg)
+{
+    GDEBUG("status is %s", status ? "true" : "false");
+    mce_inactivity_status_update(MCE_INACTIVITY(arg), status);
+}
+
+static
+void
+mce_inactivity_status_query(
+    MceInactivity* self)
+{
+    MceInactivityPriv* priv = self->priv;
+    MceProxy* proxy = priv->proxy;
+
+    /*
+     * proxy->signal and proxy->request may not be available at the
+     * time when MceInactivity is created. In that case we have to wait
+     * for the valid signal before we can connect the inactivity status
+     * signal and submit the initial query.
+     */
+    if (proxy->signal && !priv->inactivity_status_ind_id) {
+        priv->inactivity_status_ind_id = g_signal_connect(proxy->signal,
+            MCE_INACTIVITY_SIG, G_CALLBACK(mce_inactivity_status_ind), self);
+    }
+    if (proxy->request && proxy->valid) {
+        com_nokia_mce_request_call_get_inactivity_status(proxy->request, NULL,
+            mce_inactivity_status_query_done, mce_inactivity_ref(self));
+    }
+}
+
+static
+void
+mce_inactivity_valid_changed(
+    MceProxy* proxy,
+    void* arg)
+{
+    MceInactivity* self = MCE_INACTIVITY(arg);
+
+    if (proxy->valid) {
+        mce_inactivity_status_query(self);
+    } else {
+        if (self->valid) {
+            self->valid = FALSE;
+            g_signal_emit(self, mce_inactivity_signals[SIGNAL_VALID_CHANGED], 0);
+        }
+    }
+}
+
+/*==========================================================================*
+ * API
+ *==========================================================================*/
+
+MceInactivity*
+mce_inactivity_new()
+{
+    static MceInactivity* mce_inactivity_instance = NULL;
+
+    if (mce_inactivity_instance) {
+        mce_inactivity_ref(mce_inactivity_instance);
+    } else {
+        mce_inactivity_instance = g_object_new(MCE_INACTIVITY_TYPE, NULL);
+        mce_inactivity_status_query(mce_inactivity_instance);
+        g_object_add_weak_pointer(G_OBJECT(mce_inactivity_instance),
+            (gpointer*)(&mce_inactivity_instance));
+    }
+    return mce_inactivity_instance;
+}
+
+MceInactivity*
+mce_inactivity_ref(
+    MceInactivity* self)
+{
+    if (G_LIKELY(self)) {
+        g_object_ref(MCE_INACTIVITY(self));
+    }
+    return self;
+}
+
+void
+mce_inactivity_unref(
+    MceInactivity* self)
+{
+    if (G_LIKELY(self)) {
+        g_object_unref(MCE_INACTIVITY(self));
+    }
+}
+
+gulong
+mce_inactivity_add_valid_changed_handler(
+    MceInactivity* self,
+    MceInactivityFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_VALID_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+gulong
+mce_inactivity_add_status_changed_handler(
+    MceInactivity* self,
+    MceInactivityFunc fn,
+    void* arg)
+{
+    return (G_LIKELY(self) && G_LIKELY(fn)) ? g_signal_connect(self,
+        SIGNAL_STATUS_CHANGED_NAME, G_CALLBACK(fn), arg) : 0;
+}
+
+void
+mce_inactivity_remove_handler(
+    MceInactivity* self,
+    gulong id)
+{
+    if (G_LIKELY(self) && G_LIKELY(id)) {
+        g_signal_handler_disconnect(self, id);
+    }
+}
+
+void
+mce_inactivity_remove_handlers(
+    MceInactivity* self,
+    gulong* ids,
+    guint count)
+{
+    gutil_disconnect_handlers(self, ids, count);
+}
+
+/*==========================================================================*
+ * Internals
+ *==========================================================================*/
+
+static
+void
+mce_inactivity_init(
+    MceInactivity* self)
+{
+    MceInactivityPriv* priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCE_INACTIVITY_TYPE,
+        MceInactivityPriv);
+
+    self->priv = priv;
+    self->status = FALSE;
+    priv->proxy = mce_proxy_new();
+    priv->proxy_valid_id = mce_proxy_add_valid_changed_handler(priv->proxy,
+        mce_inactivity_valid_changed, self);
+}
+
+static
+void
+mce_inactivity_finalize(
+    GObject* object)
+{
+    MceInactivity* self = MCE_INACTIVITY(object);
+    MceInactivityPriv* priv = self->priv;
+
+    if (priv->inactivity_status_ind_id) {
+        g_signal_handler_disconnect(priv->proxy->signal,
+            priv->inactivity_status_ind_id);
+    }
+    mce_proxy_remove_handler(priv->proxy, priv->proxy_valid_id);
+    mce_proxy_unref(priv->proxy);
+    G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
+}
+
+static
+void
+mce_inactivity_class_init(
+    MceInactivityClass* klass)
+{
+    GObjectClass* object_class = G_OBJECT_CLASS(klass);
+
+    object_class->finalize = mce_inactivity_finalize;
+    g_type_class_add_private(klass, sizeof(MceInactivityPriv));
+    mce_inactivity_signals[SIGNAL_VALID_CHANGED] =
+        g_signal_new(SIGNAL_VALID_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+    mce_inactivity_signals[SIGNAL_STATUS_CHANGED] =
+        g_signal_new(SIGNAL_STATUS_CHANGED_NAME,
+            G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+/*
+ * Local Variables:
+ * status: C
+ * c-basic-offset: 4
+ * indent-tabs-status: nil
+ * End:
+ */
--- a/src/mce_log_p.h
+++ b/src/mce_log_p.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--- a/src/mce_proxy.c
+++ b/src/mce_proxy.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -39,12 +39,17 @@

 /* Generated headers */
 #include "com.canonical.Unity.Screen.h"
+#include "org.freedesktop.UPower.Device.h"

 GLOG_MODULE_DEFINE("mce");

 struct mce_proxy_priv {
    GDBusConnection* bus;
    guint mce_watch_id;
+    guint upower_watch_id;
+
+    gboolean unity_valid;
+    gboolean upower_valid;
 };

 enum mce_proxy_signal {
@@ -56,11 +61,14 @@ enum mce_proxy_signal {

 #define MCE_SERVICE "com.canonical.Unity.Screen"
 #define MCE_REQUEST_PATH "/com/canonical/Unity/Screen"
-#define MCE_SIGNAL_PATH "/com/canonical/Unity/Screen"
+
+#define UPOWER_SERVICE "org.freedesktop.UPower"
+#define UPOWER_REQUEST_PATH "/org/freedesktop/UPower/devices/DisplayDevice"

 static guint mce_proxy_signals[SIGNAL_COUNT] = { 0 };

 typedef GObjectClass MceProxyClass;
+GType mce_proxy_get_type() MCE_INTERNAL;
 G_DEFINE_TYPE(MceProxy, mce_proxy, G_TYPE_OBJECT)
 #define PARENT_CLASS mce_proxy_parent_class
 #define MCE_PROXY_TYPE (mce_proxy_get_type())
@@ -106,11 +114,16 @@ mce_proxy_init_check(
 {
    MceProxyPriv* priv = self->priv;

-    if (self->signal && self->request && !priv->mce_watch_id) {
+    if ( self->unity_request && !priv->mce_watch_id) {
        priv->mce_watch_id = g_bus_watch_name_on_connection(priv->bus,
            MCE_SERVICE, G_BUS_NAME_WATCHER_FLAGS_NONE,
            mce_name_appeared, mce_name_vanished, self, NULL);
    }
+    if (self->upower_request && !priv->upower_watch_id) {
+        priv->upower_watch_id = g_bus_watch_name_on_connection(priv->bus,
+            UPOWER_SERVICE, G_BUS_NAME_WATCHER_FLAGS_NONE,
+            mce_name_appeared, mce_name_vanished, self, NULL);
+    }
 }

 static
@@ -123,9 +136,9 @@ mce_proxy_request_proxy_new_finished(
    MceProxy* self = MCE_PROXY(arg);
    GError* error = NULL;

-    GASSERT(!self->request);
-    self->request = com_canonical_unity_screen_proxy_new_finish(result, &error);
-    if (self->request) {
+    GASSERT(!self->unity_request);
+    self->unity_request = com_canonical_unity_screen_proxy_new_finish(result, &error);
+    if (self->unity_request) {
        mce_proxy_init_check(self);
    } else {
        GERR("Failed to initialize MCE request proxy: %s", GERRMSG(error));
@@ -136,7 +149,7 @@ mce_proxy_request_proxy_new_finished(

 static
 void
-mce_proxy_signal_proxy_new_finished(
+mce_proxy_request_proxy_upower_new_finished(
    GObject* object,
    GAsyncResult* result,
    gpointer arg)
@@ -144,12 +157,12 @@ mce_proxy_signal_proxy_new_finished(
    MceProxy* self = MCE_PROXY(arg);
    GError* error = NULL;

-    GASSERT(!self->signal);
-    self->signal = com_canonical_unity_screen_proxy_new_finish(result, &error);
-    if (self->signal) {
+    GASSERT(!self->upower_request);
+    self->upower_request = org_freedesktop_upower_device_proxy_new_finish(result, &error);
+    if (self->upower_request) {
        mce_proxy_init_check(self);
    } else {
-        GERR("Failed to initialize MCE signal proxy: %s", GERRMSG(error));
+        GERR("Failed to initialize MCE upower request proxy: %s", GERRMSG(error));
        g_error_free(error);
    }
    mce_proxy_unref(self);
@@ -169,14 +182,14 @@ mce_proxy_bus_get_finished(
    priv->bus = g_bus_get_finish(result, &error);
    if (priv->bus) {
        com_canonical_unity_screen_proxy_new(priv->bus,
-            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+            G_DBUS_PROXY_FLAGS_NONE,
            MCE_SERVICE, MCE_REQUEST_PATH, NULL,
            mce_proxy_request_proxy_new_finished,
            mce_proxy_ref(self));
-        com_canonical_unity_screen_proxy_new(priv->bus,
-            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-            MCE_SERVICE, MCE_SIGNAL_PATH, NULL,
-            mce_proxy_signal_proxy_new_finished,
+        org_freedesktop_upower_device_proxy_new(priv->bus,
+            G_DBUS_PROXY_FLAGS_NONE,
+            UPOWER_SERVICE, UPOWER_REQUEST_PATH, NULL,
+            mce_proxy_request_proxy_upower_new_finished,
            mce_proxy_ref(self));
    } else {
        GERR("Failed to attach to system bus: %s", GERRMSG(error));
@@ -264,11 +277,14 @@ mce_proxy_finalize(
    if (priv->mce_watch_id) {
        g_bus_unwatch_name(priv->mce_watch_id);
    }
-    if (self->signal) {
-        g_object_unref(self->signal);
+    if (priv->upower_watch_id) {
+        g_bus_unwatch_name(priv->upower_watch_id);
    }
-    if (self->request) {
-        g_object_unref(self->request);
+    if (self->unity_request) {
+        g_object_unref(self->unity_request);
+    }
+    if (self->upower_request) {
+        g_object_unref(self->upower_request);
    }
    if (priv->bus) {
        g_object_unref(priv->bus);
--- a/src/mce_proxy.h
+++ b/src/mce_proxy.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2022 Jolla Ltd.
+ * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
 *
 * You may use this file under the terms of BSD license as follows:
 *
@@ -13,9 +13,9 @@
 *   2. Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -37,17 +37,20 @@
 #ifndef MCE_PROXY_H
 #define MCE_PROXY_H

-#include "mce_types.h"
+#include "mce_types_p.h"
+
+#include <glib-object.h>

 typedef struct mce_proxy_priv MceProxyPriv;
 struct _ComCanonicalUnityScreen;
+struct _OrgFreedesktopUPowerDevice;

 typedef struct mce_proxy {
    GObject object;
    MceProxyPriv* priv;
    gboolean valid;
-    struct _ComCanonicalUnityScreen* signal;
-    struct _ComCanonicalUnityScreen* request;
+    struct _ComCanonicalUnityScreen* unity_request;
+    struct _OrgFreedesktopUPowerDevice* upower_request;
 } MceProxy;

 typedef void
@@ -57,26 +60,31 @@ typedef void

 MceProxy*
 mce_proxy_new(
-    void);
+    void)
+    MCE_INTERNAL;

 MceProxy*
 mce_proxy_ref(
-    MceProxy* proxy);
+    MceProxy* proxy)
+    MCE_INTERNAL;

 void
 mce_proxy_unref(
-    MceProxy* proxy);
+    MceProxy* proxy)
+    MCE_INTERNAL;

 gulong
 mce_proxy_add_valid_changed_handler(
    MceProxy* proxy,
    MceProxyFunc fn,
-    void* arg);
+    void* arg)
+    MCE_INTERNAL;

 void
 mce_proxy_remove_handler(
    MceProxy* proxy,
-    gulong id);
+    gulong id)
+    MCE_INTERNAL;

 #endif /* MCE_PROXY_H */

--- a/src/mce_types_p.h
+++ b/src/mce_types_p.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef MCE_TYPES_PRIVATE_H
+#define MCE_TYPES_PRIVATE_H
+
+#include <mce_types.h>
+
+/* Macros */
+#define MCE_INTERNAL G_GNUC_INTERNAL
+
+#endif /* MCE_TYPES_PRIVATE_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
Author	SHA1	Message	Date
Ratchanan Srirattanamet	a77c5d0179	Merge branch 'ubports/focal_-_5g' into 'main' Sync with upstream, fix display signal and add support for ayatana battery and charger See merge request ubports/development/core/hybris-support/libmce-glib-repowerd-stub!1	2024-08-09 08:08:05 +00:00
Ratchanan Srirattanamet	0165d7a37d	d/ubports.skip_distro: skip building on Debian	2024-08-09 07:14:40 +00:00
Jami Kettunen	1c86495779	treewide: Migrate to UPower D-Bus API from ayatana power indicator	2024-07-13 23:22:24 +03:00
Marius Gripsgard	b2c8f8026a	examples: Make example work with our stub	2023-09-21 04:17:14 +02:00
Marius Gripsgard	b5d5f52894	treewide: Add support for ayatana battery and charger	2023-09-21 04:17:10 +02:00
Marius Gripsgard	a6e3ba2c61	src/display: Fix display power state changed signal	2023-09-21 03:59:35 +02:00
Marius Gripsgard	914b5b732c	Merge remote-tracking branch 'upstream/master' into personal/mariogrip/update	2023-09-17 23:39:29 +02:00
Simo Piiroinen	49cff7f515	Version 1.1.0	2023-05-08 10:48:56 +03:00
Simo Piiroinen	b65226eea5	Merge pull request #1 from spiiroin/jb60550_inactivity [libmce-glib] Add MceInactivity object	2023-05-08 10:43:33 +03:00
Simo Piiroinen	7e0b708217	[libmce-glib] Add an example application Serves as an example on how to use functionality provided by libmce-glib and is useful also for testing and debugging the library itself. Note that the application is built using libmce-glib headers and libraries that are installed in the development environment - the same way regular applications not included in libmce-glib source tree need to operate. Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>	2023-05-08 10:33:23 +03:00
Slava Monich	5a848146b4	[debian] Bumped debhelper compat level to 7	2023-04-23 22:00:44 +03:00
Slava Monich	aeaea4ff4e	[libmce-glib] A better way to silence deprecation warnings	2023-04-23 21:59:23 +03:00
Simo Piiroinen	771ac3ece9	[libmce-glib] Add MceInactivity object. Fixes JB#60550 Tracks user inactivity as reported by MCE. Created by using already existing MceTklock object as a template. Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>	2023-04-17 12:27:32 +03:00
Slava Monich	9a14618c13	Version 1.0.13	2022-01-19 14:30:52 +02:00
Slava Monich	d83584dbd2	[libmce-glib] Shuffled includes a bit. JB#43321 The goal was to avoid pulling in <glib-object.h> unnecessarily. Not that it was a big deal...	2022-01-19 14:19:00 +02:00
Slava Monich	2e0818c642	[license] Install LICENSE file. JB#55991	2022-01-19 14:19:00 +02:00
Slava Monich	7d8b7077ef	[license] Unified and freshened up licenses. JB#55991	2022-01-19 14:18:50 +02:00
Slava Monich	0a4a06109f	Version 1.0.12	2021-11-08 03:09:45 +02:00
Slava Monich	78f4870988	[libmce-glib] Housekeeping. JB#43321	2021-11-08 03:07:42 +02:00
Slava Monich	dddb061116	[libmce-glib] Update license. JB#43321	2021-11-08 02:45:41 +02:00
pvuorela	2a38041345	Merge branch 'permissions' into 'master' Install library as executable See merge request mer-core/libmce-glib!8	2020-09-15 13:12:17 +00:00
Rinigus	67c6d3342a	[libmce-glib] Install library as executable. JB#51013 Signed-off-by: Rinigus <rinigus.git@gmail.com>	2020-08-31 18:24:11 +03:00
Slava Monich	f9139dd620	Version 1.0.10	2020-05-25 15:13:02 +03:00
Slava Monich	be3d072c68	Merge branch 'lib64' into 'master' Respect arch specific lib dir See merge request mer-core/libmce-glib!7	2020-05-25 12:09:55 +00:00
Slava Monich	dcfa3ffeef	[libmce-glib] Respect arch specific lib dir. JB#49681	2020-05-25 02:51:44 +03:00
Slava Monich	c60c134980	[libmce-glib] Hide internal symbols. JB#43321 If nothing else, this makes the library file smaller by reducing the size of the dynamic symbol table.	2020-05-25 02:51:29 +03:00
Slava Monich	fb4d97ceeb	Version 1.0.9	2020-03-08 16:38:05 +02:00
Slava Monich	f98df32c33	[libmce-glib] Update license. JB#43321	2020-03-08 16:37:38 +02:00
Slava Monich	fa71879909	[libmce-glib] Ignore GLib deprecation warnings. JB#43321 Apparently, the only way to get rid of "warning: G_ADD_PRIVATE" with latest GLib is to completely disable all Glib deprecation warnings.	2020-03-08 16:34:11 +02:00
Slava Monich	488a3f59a4	Version 1.0.8	2019-11-05 14:29:23 +03:00
Slava Monich	3330da03d4	Merge branch 'master' into 'master' Avoid overlinking See merge request mer-core/libmce-glib!6	2019-11-05 11:18:06 +00:00
Slava Monich	a17b8f296a	[libmce-glib] Avoid overlinking. JB#43321	2019-11-01 23:40:17 +02:00
Slava Monich	517cdafd22	Version 1.0.7	2019-08-30 18:33:30 +03:00
Slava Monich	a0632c6d2f	Makefile: Tweaked linker command line This way shared library gets correctly linked with its dependencies	2019-08-30 18:31:34 +03:00
Slava Monich	8ede3b6494	Makefile: added missing separator	2019-08-30 18:13:16 +03:00
Slava Monich	b2e51ed0be	Merge branch 'master' into 'master' [build] Allow use of CC & LDFLAGS defined by build system. JB#43321 See merge request mer-core/libmce-glib!5	2019-08-30 15:09:46 +00:00
Herrie	eba54c2ad4	Makefile: Allow use of CC & LDFLAGS defined by build system. When building within Yocto projects such as LuneOS, we want to use CC & LDFLAGS provided by the build toolchain. Signed-off-by: Herman van Hazendonk github.com@herrie.org Signed-off-by: Christophe Chapuis chris.chapuis@gmail.com	2019-08-26 13:19:38 +00:00
Slava Monich	cf94eddcb9	[libmce-glib] Version 1.0.6	2019-08-22 12:38:01 +03:00
Slava Monich	f5a3cb196f	[libmce-glib] Tweaked makefile dependencies And removed unused variables	2019-08-22 12:36:37 +03:00
Slava Monich	03fba9b262	Merge branch 'battery' into 'master' Add MceBattery and MceCharger objects See merge request mer-core/libmce-glib!4	2019-08-22 09:12:57 +00:00
Slava Monich	ce5fef5eb4	[libmce-glib] Added MceCharger object. JB#46836	2019-08-22 12:12:01 +03:00
Slava Monich	10dc2bd0ef	[libmce-glib] Added MceBattery object. JB#43321 Allows to watch battery level and status.	2019-08-21 21:14:59 +03:00
				`@@ -1 +0,0 @@`
				`debian/tmp/usr/lib/libmce-glib.so.* usr/lib`
				`@@ -0,0 +1 @@`
				`debian/tmp/@LIBDIR@/libmce-glib.so.* @LIBDIR@`