Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2013-10-24 14:15:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-10-18 13:29:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2013-10-24 14:15:22.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 23 15:11:59 UTC 2013 - gber@opensuse.org + +- fix xfce4-power-manager-systemd-suspend-hibernate-suport.patch so + that it handles cases where CanSuspend/CanHibernate returns + "challenge", this is consitent behavior with xfce4-session + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager-systemd-suspend-hibernate-suport.patch ++++++ --- /var/tmp/diff_new_pack.jNZgpm/_old 2013-10-24 14:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.jNZgpm/_new 2013-10-24 14:15:23.000000000 +0200 @@ -93,7 +93,7 @@ static void xfpm_power_check_pm (XfpmPower *power, GHashTable *props) { -@@ -193,6 +197,32 @@ xfpm_power_check_pm (XfpmPower *power, G +@@ -193,6 +197,33 @@ xfpm_power_check_pm (XfpmPower *power, G power->priv->can_hibernate = ret; } } @@ -116,9 +116,10 @@ + return FALSE; + } + -+ if (retstr && !strcmp (retstr, "yes")) -+ ret = TRUE; -+ g_free (retstr); ++ if ((g_strcmp0 (retstr, "yes") == 0) || ++ (g_strcmp0 (retstr, "challenge") == 0)) ++ ret = TRUE; ++ g_free (retstr); + + return ret; +} @@ -126,7 +127,7 @@ static void xfpm_power_check_power (XfpmPower *power, GHashTable *props) -@@ -283,7 +313,12 @@ xfpm_power_get_properties (XfpmPower *po +@@ -283,7 +314,12 @@ xfpm_power_get_properties (XfpmPower *po props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE); @@ -139,7 +140,7 @@ xfpm_power_check_lid (power, props); xfpm_power_check_power (power, props); -@@ -354,9 +389,16 @@ xfpm_power_sleep (XfpmPower *power, cons +@@ -354,9 +390,16 @@ xfpm_power_sleep (XfpmPower *power, cons xfpm_lock_screen (); } @@ -156,7 +157,7 @@ if ( error ) { -@@ -1394,12 +1436,20 @@ xfpm_power_init (XfpmPower *power) +@@ -1394,12 +1437,20 @@ xfpm_power_init (XfpmPower *power) UPOWER_NAME, UPOWER_PATH, DBUS_INTERFACE_PROPERTIES); @@ -177,7 +178,7 @@ xfpm_power_get_power_devices (power); xfpm_power_get_properties (power); #ifdef ENABLE_POLKIT -@@ -1506,6 +1556,11 @@ xfpm_power_finalize (GObject *object) +@@ -1506,6 +1557,11 @@ xfpm_power_finalize (GObject *object) if ( power->priv->proxy_prop ) g_object_unref (power->priv->proxy_prop); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org