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

[Ali Abdallah]

Author: aliov
Date: 2008-10-20 13:59:32 +0000 (Mon, 20 Oct 2008)
New Revision: 5718

Modified:
   xfce4-power-manager/trunk/src/xfpm-battery.c
   xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c
Log:
Handle carefully null udi returned from HAL

Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c	2008-10-20 13:53:56 UTC (rev 5717)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c	2008-10-20 13:59:32 UTC (rev 5718)
@@ -1194,10 +1194,9 @@
         g_error_free(error);
         return;
     }
-    if ( !udi || num == 0 ) 
-    {
-        return;
-    }
+    if ( num == 0 ) return;
+    if ( !udi )     return; 
+
     for ( i = 0 ; udi[i]; i++)
     {
         if ( xfpm_hal_device_have_key(priv->hal,udi[i],"battery.is_rechargeable"))

Modified: xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c	2008-10-20 13:53:56 UTC (rev 5717)
+++ xfce4-power-manager/trunk/src/xfpm-lcd-brightness.c	2008-10-20 13:59:32 UTC (rev 5718)
@@ -340,8 +340,10 @@
         g_error_free(error);
         return;
     }
-    
-    if ( !udi || num == 0 )
+
+    if ( num == 0 ) return;
+        
+    if ( !udi )
     {
         XFPM_DEBUG("No device with laptop_panel capability\n");
         return;