[Goodies-commits] r5779 - xfce4-power-manager/trunk/src

[Ali Abdallah]

Author: aliov
Date: 2008-10-23 19:23:09 +0000 (Thu, 23 Oct 2008)
New Revision: 5779

Modified:
   xfce4-power-manager/trunk/src/xfpm-battery.c
Log:
Improve battery critical charge notification

Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c	2008-10-23 17:03:37 UTC (rev 5778)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c	2008-10-23 19:23:09 UTC (rev 5779)
@@ -101,7 +101,9 @@
                                                         const gchar *key,gboolean is_removed,
                                                         gboolean is_added,XfpmBattery *batt);
                                                         
-static void xfpm_battery_show_critical_options(XfpmBattery *batt,XfpmBatteryIcon *icon);
+static void xfpm_battery_show_critical_options(XfpmBattery *batt,
+											   XfpmBatteryIcon *icon,
+											   XfpmBatteryType battery_type);
 static void xfpm_battery_handle_primary_critical(XfpmBattery *batt,
                                                 XfpmBatteryIcon *icon);
 static void xfpm_battery_handle_ups_critical(XfpmBattery *batt,
@@ -768,7 +770,7 @@
 #endif
 
 static void
-xfpm_battery_show_critical_options(XfpmBattery *batt,XfpmBatteryIcon *icon)
+xfpm_battery_show_critical_options(XfpmBattery *batt,XfpmBatteryIcon *icon,XfpmBatteryType battery_type)
 {
     XfpmBatteryPrivate *priv;
     priv = XFPM_BATTERY_GET_PRIVATE(batt);
@@ -784,7 +786,7 @@
                                              20000,
                                              NOTIFY_URGENCY_CRITICAL,
                                              GTK_STATUS_ICON(icon),
-                                             "gpm-ac-adapter");
+                                             battery_type == PRIMARY ? "gpm-primary-000" : "gpm-ups-000");
     if (priv->power_management & SYSTEM_CAN_SHUTDOWN )
     {
         xfpm_notify_add_action(n,
@@ -858,14 +860,14 @@
     
     if ( batt->critical_action == XFPM_DO_NOTHING )
     {
-        xfpm_battery_show_critical_options(batt,icon);
+        xfpm_battery_show_critical_options(batt,icon,PRIMARY);
     }
 }
 
 static void
 xfpm_battery_handle_ups_critical(XfpmBattery *batt,XfpmBatteryIcon *icon)
 {
-    xfpm_battery_show_critical_options(batt,icon);
+    xfpm_battery_show_critical_options(batt,icon,UPS);
 }
 
 static void