Merge branch 'maemo/beowulf'

maemo-leste · Apr 24, 2021 · e36452d · e36452d
2 parents f1e66d0 + 3d9ab2f
commit e36452d
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 31 deletions.
diff --git a/AUTHORS b/AUTHORS
diff --git a/ChangeLog b/ChangeLog
diff --git a/Makefile b/Makefile
diff --git a/Makefile.am b/Makefile.am
@@ -0,0 +1,24 @@
+hildondesktoplib_LTLIBRARIES = status-area-applet-battery.la
+
+status_area_applet_battery_la_SOURCES = status-area-applet-battery.c \
+										batmon.c
+
+status_area_applet_battery_la_CFLAGS = \
+	$(LIBHILDON_CFLAGS) $(LIBCANBERRA_CFLAGS) $(LIBHILDONDESKTOP_CFLAGS) \
+	$(PROFILE_CFLAGS) $(DBUS_CFLAGS) $(GCONF_CFLAGS) $(UPOWER_GLIB_CFLAGS)
+
+status_area_applet_battery_la_LIBADD = \
+	$(LIBHILDON_LIBS) $(LIBCANBERRA_LIBS) $(LIBHILDONDESKTOP_LIBS) \
+	$(PROFILE_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(UPOWER_GLIB_LIBS)
+
+status_area_applet_battery_la_LDFLAGS = -Wl,--as-needed -module -avoid-version
+
+gconfschemasdir = $(sysconfdir)/gconf/schemas
+dist_gconfschemas_DATA = status-area-applet-battery.schemas
+
+hildonstatusmenudesktopentry_DATA = status-area-applet-battery.desktop
+EXTRA_DIST = $(hildonstatusmenudesktopentry_DATA)
+
+install-data-hook:
+	@(cd $(DESTDIR)$(hildondesktoplibdir) && $(RM) \
+		$(hildondesktoplib_LTLIBRARIES))
diff --git a/NEWS b/NEWS
diff --git a/batmon.c b/batmon.c
@@ -86,6 +86,7 @@ check_device(UpDevice *dev)
         technology != UP_DEVICE_TECHNOLOGY_UNKNOWN)
     {
       private.battery = dev;
+      g_object_ref(private.battery);
     }
 
     return;
@@ -95,6 +96,7 @@ check_device(UpDevice *dev)
       private.charger == NULL)
   {
     private.charger = dev;
+    g_object_ref(private.charger);
   }
 }
 
@@ -105,7 +107,7 @@ find_upower_devices()
   GPtrArray *devices;
   guint      i;
 
-  devices = up_client_get_devices(private.client);
+  devices = up_client_get_devices2(private.client);
 
   for (i = 0;  i < devices->len;  i++)
   {
@@ -307,6 +309,10 @@ free_batt(void)
 {
   if (private.client)
     g_object_unref(private.client);
+  if (private.battery)
+    g_object_unref(private.battery);
+  if (private.charger)
+    g_object_unref(private.charger);
 
   memset(&private, 0, sizeof(private));
 }
diff --git a/configure.ac b/configure.ac
@@ -0,0 +1,49 @@
+AC_INIT([Status area battery applet],
+        [1.5.0],
+        [merlijn@wizzup.org], [status-area-applet-battery])
+
+#[patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']),],
+AM_INIT_AUTOMAKE
+LT_INIT([shared disable-static])
+AC_CONFIG_FILES([Makefile])
+
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+PKG_CHECK_MODULES(LIBHILDON, hildon-1)
+AC_SUBST(LIBHILDON_CFLAGS)
+AC_SUBST(LIBHILDON_LIBS)
+
+PKG_CHECK_MODULES(LIBCANBERRA, libcanberra)
+AC_SUBST(LIBCANBERRA_CFLAGS)
+AC_SUBST(LIBCANBERRA_LIBS)
+
+PKG_CHECK_MODULES(LIBHILDONDESKTOP, libhildondesktop-1)
+AC_SUBST(LIBHILDONDESKTOP_CFLAGS)
+AC_SUBST(LIBHILDONDESKTOP_LIBS)
+
+PKG_CHECK_MODULES(PROFILE, profile)
+AC_SUBST(PROFILE_CFLAGS)
+AC_SUBST(PROFILE_LIBS)
+
+PKG_CHECK_MODULES(DBUS, dbus-1)
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+
+PKG_CHECK_MODULES(GCONF, gconf-2.0)
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+
+PKG_CHECK_MODULES(UPOWER_GLIB, upower-glib)
+AC_SUBST(UPOWER_GLIB_CFLAGS)
+AC_SUBST(UPOWER_GLIB_LIBS)
+
+AC_CONFIG_FILES(status-area-applet-battery.schemas)
+
+hildonstatusmenudesktopentrydir="`$PKG_CONFIG --variable=hildonstatusmenudesktopentrydir libhildondesktop-1`"
+AC_SUBST(hildonstatusmenudesktopentrydir)
+
+hildondesktoplibdir="`$PKG_CONFIG --variable=hildondesktoplibdir osso-af-settings`"
+AC_SUBST(hildondesktoplibdir)
+
+AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,29 @@
+status-area-applet-battery (1.5.3-1) unstable; urgency=medium
+
+  * Fix port Upower port done by me
+  * Revert g_type_class_add_private deprecation.
+
+ -- Merlijn Wajer <merlijn@wizzup.org>  Mon, 23 Mar 2020 13:25:15 +0100
+
+status-area-applet-battery (1.5.2-1) unstable; urgency=medium
+
+  * Fix autotools and wrong macro
+
+ -- Merlijn Wajer <merlijn@wizzup.org>  Sun, 26 Jan 2020 20:13:34 +0100
+
+status-area-applet-battery (1.5.1-1) unstable; urgency=medium
+
+  * Port to autotools (fixes install paths)
+
+ -- Merlijn Wajer <merlijn@wizzup.org>  Sat, 25 Jan 2020 13:46:51 +0100
+
+status-area-applet-battery (1.5.0-1) unstable; urgency=medium
+
+  * Port to newer UPower API
+  * Deprecate g_type_class_add_private
+
+ -- Merlijn Wajer <merlijn@wizzup.org>  Thu, 23 Jan 2020 13:16:01 +0100
+
 status-area-applet-battery (1.4.2) unstable; urgency=medium
 
   * Increase interval for 'battery low' warnings

diff --git a/debian/control b/debian/control
@@ -17,7 +17,8 @@ Build-Depends:
  libdbus-1-dev,
  libdbus-glib-1-dev,
  libglib2.0-dev,
- libupower-glib-dev (>=1:0.99.7.5)
+ libupower-glib-dev (>=1:0.99.7.5),
+ osso-af-settings
 Standards-Version: 3.7.3
 
 Package: status-area-applet-battery

diff --git a/debian/rules b/debian/rules
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
 %:
 	dh $@
diff --git a/status-area-applet-battery.schemas → status-area-applet-battery.schemas.in b/status-area-applet-battery.schemas → status-area-applet-battery.schemas.in