Index: xfpm-supply.c
===================================================================
--- xfpm-supply.c	(revision 7847)
+++ xfpm-supply.c	(working copy)
@@ -392,7 +392,7 @@
 {
     XfpmShutdownRequest critical_action;
     
-    g_object_get (G_OBJECT (supply),
+    g_object_get (G_OBJECT (supply->priv->conf),
 	          CRITICAL_BATT_ACTION_CFG, &critical_action,
 		  NULL);
 
@@ -426,7 +426,7 @@
 	g_object_notify (G_OBJECT (supply), "on-low-battery");
 	xfpm_supply_handle_primary_critical (supply, battery);
     }
-    else if ( !low_power && supply->priv->low_power )
+    if ( !low_power && supply->priv->low_power )
     {
 	supply->priv->low_power = FALSE;
 	g_object_notify (G_OBJECT (supply), "on-low-battery");