Hello community,
here is the log from the commit of package xfce4-power-manager for
openSUSE:Factory
checked in at Mon Jul 25 09:21:57 CEST 2011.
--------
--- xfce4-power-manager/xfce4-power-manager.changes 2011-05-04
10:47:59.000000000 +0200
+++
/mounts/work_src_done/STABLE/xfce4-power-manager/xfce4-power-manager.changes
2011-06-29 10:56:24.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Jun 29 08:02:05 UTC 2011 - [email protected]
+
+- added xfce4-power-manager-1.0.10-fix-broken-icon.patch which
+ fixes the pbroken empty battery icon in the tray
+- added xfce4-power-manager-1.0.10-support-networkmanager-0.9.patch
+ which adds support fro NetworkManager 0.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xfce4-power-manager-1.0.10-fix-broken-icon.patch
xfce4-power-manager-1.0.10-support-networkmanager-0.9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.anJfbD/_old 2011-07-25 09:19:08.000000000 +0200
+++ /var/tmp/diff_new_pack.anJfbD/_new 2011-07-25 09:19:08.000000000 +0200
@@ -20,7 +20,7 @@
Name: xfce4-power-manager
Version: 1.0.10
-Release: 12
+Release: 14
License: GPLv2+
Summary: Power Management for the Xfce Desktop Dnvironment
Url:
http://goodies.xfce.org/projects/applications/xfce4-power-manager/
@@ -30,6 +30,10 @@
Patch0: xfce4-power-manager-0.9.98-lxde-support.patch
# PATCH-FIX-UPSTREAM xfce4-power-manager-1.0.10-fix-libnotify-0.7.patch
[email protected] -- Fix the libnotify 0.7.0 API usage
Patch1: xfce4-power-manager-1.0.10-fix-libnotify-0.7.patch
+# PATCH-FEATURE-UPSTREAM
xfce4-power-manager-1.0.10-support-networkmanager-0.9.patch [email protected]
-- Adds support for NetworkManager 0.9
+Patch2: xfce4-power-manager-1.0.10-support-networkmanager-0.9.patch
+# PATCH-FIX-UPSTREAM xfce4-power-manager-1.0.10-fix-broken-icon.patch
[email protected] -- Fix broken empty battery icon in tray
+Patch3: xfce4-power-manager-1.0.10-fix-broken-icon.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: pkgconfig(dbus-glib-1)
@@ -69,6 +73,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%configure --disable-hal
++++++ xfce4-power-manager-1.0.10-fix-broken-icon.patch ++++++
>From 643962eb2d46d48042db0ab278c46813da8b6e9b Mon Sep 17 00:00:00 2001
From: Ali Abdallah <[email protected]>
Date: Mon, 27 Jun 2011 14:27:15 +0000
Subject: Fix Broken empty battery icon..
---
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index 9d8bbd9..763b014 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -309,10 +309,14 @@ xfpm_battery_refresh_icon (XfpmBattery *battery)
battery->priv->icon_prefix,
xfpm_battery_get_icon_index (battery->priv->type,
battery->priv->percentage));
}
+ else if ( battery->priv->state == XFPM_DEVICE_STATE_EMPTY)
+ {
+ g_snprintf (icon_name, 128, "%s%s", battery->priv->icon_prefix,
battery->priv->ac_online ? "000-charging" : "000");
+ }
}
else
{
- if ( !battery->priv->present )
+ if ( !battery->priv->present || battery->priv->state ==
XFPM_DEVICE_STATE_EMPTY )
{
g_snprintf (icon_name, 128, "%s-000", battery->priv->icon_prefix);
}
++++++ xfce4-power-manager-1.0.10-support-networkmanager-0.9.patch ++++++
>From 2a8d115e4172c4d09be86cb8182af89b97e1250b Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <[email protected]>
Date: Tue, 15 Mar 2011 16:59:50 +0000
Subject: Support NetworkManager 0.9
---
diff --git a/src/xfpm-network-manager.c b/src/xfpm-network-manager.c
index 651f746..908b813 100644
--- a/src/xfpm-network-manager.c
+++ b/src/xfpm-network-manager.c
@@ -29,9 +29,8 @@
/*
* Inform the Network Manager when we do suspend/hibernate
- * message is either "wake" or "sleep"
*/
-gboolean xfpm_send_message_to_network_manager (const gchar *message)
+gboolean xfpm_network_manager_sleep (gboolean sleep)
{
#ifdef WITH_NETWORK_MANAGER
@@ -59,7 +58,7 @@ gboolean xfpm_send_message_to_network_manager (const
gchar *message)
return FALSE;
}
- dbus_g_proxy_call_no_reply (proxy, message, G_TYPE_INVALID);
+ dbus_g_proxy_call_no_reply (proxy, "Sleep", G_TYPE_BOOLEAN, sleep,
G_TYPE_INVALID);
g_object_unref (G_OBJECT(proxy));
dbus_g_connection_unref (bus);
diff --git a/src/xfpm-network-manager.h b/src/xfpm-network-manager.h
index 9d77ab8..51d0987 100644
--- a/src/xfpm-network-manager.h
+++ b/src/xfpm-network-manager.h
@@ -23,7 +23,7 @@
G_BEGIN_DECLS
-gboolean xfpm_send_message_to_network_manager (const gchar *message);
+gboolean xfpm_network_manager_sleep (gboolean sleep);
G_END_DECLS
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index bbe1a77..d22e502 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -337,7 +337,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar
*sleep_time, gboolean force)
}
g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0);
- xfpm_send_message_to_network_manager ("sleep");
+ xfpm_network_manager_sleep (TRUE);
g_object_get (G_OBJECT (power->priv->conf),
LOCK_SCREEN_ON_SLEEP, &lock_screen,
@@ -373,7 +373,7 @@ xfpm_power_sleep (XfpmPower *power, const gchar
*sleep_time, gboolean force)
}
g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0);
- xfpm_send_message_to_network_manager ("wake");
+ xfpm_network_manager_sleep (FALSE);
}
static void
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
