Hello community,

here is the log from the commit of package xfce4-power-manager for 
openSUSE:Factory checked in at 2014-10-29 21:10:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old)
 and      /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfce4-power-manager"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes  
2014-09-28 19:54:11.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 
    2014-10-29 21:10:47.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Oct 27 16:20:38 UTC 2014 - g...@opensuse.org
+
+- add xfce4-power-manager-fix-critical-battery-action.patch in
+  order to fix the broken critical battery action (bxo#11237,
+  backported from upstream git)
+
+-------------------------------------------------------------------

New:
----
  xfce4-power-manager-fix-critical-battery-action.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.HBHde4/_old  2014-10-29 21:10:50.000000000 +0100
+++ /var/tmp/diff_new_pack.HBHde4/_new  2014-10-29 21:10:50.000000000 +0100
@@ -27,6 +27,8 @@
 Url:            
http://goodies.xfce.org/projects/applications/xfce4-power-manager
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        xfce4-power-manager.xml
+# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-critical-battery-action.patch 
bxo#11237 g...@opensuse.org -- Fix the broken critical battery action 
(backported from upstream git)
+Patch0:         xfce4-power-manager-fix-critical-battery-action.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  libxslt-tools
@@ -110,6 +112,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # xfce4-pm-helper is only needed on non-systemd systems
 xsltproc --nonet - ./src/org.xfce.power.policy.in2 <<'EOF' \

++++++ xfce4-power-manager-fix-critical-battery-action.patch ++++++
>From b0d8826e561ef7063ff43b72d066833a9d80f1dc Mon Sep 17 00:00:00 2001
From: Eric Koegel <eric.koe...@gmail.com>
Date: Mon, 27 Oct 2014 13:47:27 +0300
Subject: Fix for critical battery action (Bug #11237)

There were a couple of 'typos' to correct and now there's action
at critical power.
Patch submitted by Simon P.

diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index 15691d8..7d95d49 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -395,7 +395,7 @@ static void xfpm_battery_get_property (GObject *object,
            g_value_set_boolean (value, battery->priv->ac_online);
            break;
        case PROP_DEVICE_TYPE:
-           g_value_set_enum (value, battery->priv->type);
+           g_value_set_uint (value, battery->priv->type);
            break;
        case PROP_CHARGE_STATUS:
            g_value_set_enum (value, battery->priv->charge);
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index e428a15..ac5850b 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -482,7 +482,7 @@ xfpm_power_get_current_charge_state (XfpmPower *power)
        g_object_get (G_OBJECT (g_list_nth_data (list, i)),
                   "charge-status", &battery_charge,
                   "device-type", &type,
-                  "power-supply", &power_supply,
+                  "ac-online", &power_supply,
                   NULL);
        if ( type != UP_DEVICE_KIND_BATTERY &&
             type != UP_DEVICE_KIND_UPS &&
-- 
cgit v0.10.1


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to