[Xfce4-commits] <xfce4-power-manager:master> Refresh adaptor icon when battery device removed.

[Ali Abdallah]

Updating branch refs/heads/master
         to 484409ef3abec46797067aa8e581e868c2959506 (commit)
       from 4c705bee7f3bb154ad7212a4604e26de1ef123cc (commit)

commit 484409ef3abec46797067aa8e581e868c2959506
Author: Ali Abdallah <aliov at xfce.org>
Date:   Wed Jul 6 11:43:30 2011 +0200

    Refresh adaptor icon when battery device removed.

 src/xfpm-power.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index d22e502..45ad928 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -981,7 +981,7 @@ static void
 xfpm_power_add_device (XfpmPower *power, const gchar *object_path)
 {
     DBusGProxy *proxy_prop;
-    guint device_type;
+    guint device_type = XFPM_DEVICE_TYPE_UNKNOWN;
     GValue value;
     
     proxy_prop = dbus_g_proxy_new_for_name (power->priv->bus, 
@@ -999,6 +999,8 @@ xfpm_power_add_device (XfpmPower *power, const gchar *object_path)
     
     device_type = g_value_get_uint (&value);
     
+    XFPM_DEBUG_ENUM (device_type, XFPM_TYPE_DEVICE_TYPE, " device added");
+    
     if ( device_type == XFPM_DEVICE_TYPE_BATTERY || 
 	 device_type == XFPM_DEVICE_TYPE_UPS     ||
 	 device_type == XFPM_DEVICE_TYPE_MOUSE   ||
@@ -1075,6 +1077,7 @@ static void
 xfpm_power_changed_cb (DBusGProxy *proxy, XfpmPower *power)
 {
     xfpm_power_get_properties (power);
+    xfpm_power_refresh_adaptor_visible (power);
 }
 
 static void
@@ -1092,14 +1095,7 @@ xfpm_power_device_removed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmP
 static void
 xfpm_power_device_changed_cb (DBusGProxy *proxy, const gchar *object_path, XfpmPower *power)
 {
-    XfpmBattery *battery;
-    
-    battery = g_hash_table_lookup (power->priv->hash, object_path);
-    
-    if ( battery )
-    {
-	
-    }
+    xfpm_power_refresh_adaptor_visible (power);
 }
 
 #ifdef ENABLE_POLKIT