[Goodies-commits] r6920 - in xfce4-power-manager/trunk: . src

Ali Abdallah aliov at xfce.org
Mon Mar 16 17:36:48 CET 2009


Author: aliov
Date: 2009-03-16 16:36:48 +0000 (Mon, 16 Mar 2009)
New Revision: 6920

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
   xfce4-power-manager/trunk/src/xfpm-engine.c
   xfce4-power-manager/trunk/src/xfpm-idle.c
   xfce4-power-manager/trunk/src/xfpm-idle.h
   xfce4-power-manager/trunk/src/xfpm-supply.c
   xfce4-power-manager/trunk/src/xfpm-supply.h
Log:
Fix wrong alarm settings

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/ChangeLog	2009-03-16 16:36:48 UTC (rev 6920)
@@ -1,4 +1,7 @@
 
+2009-03-16 17:36 Ali aliov at xfce.org 
+	 * : Fix wrong alarm settings
+
 2009-03-16 15:39 Ali aliov at xfce.org 
 	 * : Set brightness idle level to the last user selected level+Fix a bug in SetCpuFreqGovernor that was causing a proxy disconnection
 

Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c	2009-03-16 16:36:48 UTC (rev 6920)
@@ -309,6 +309,7 @@
 	brg->priv->block = FALSE;
     
     level = xfpm_brightness_hal_get_level(brg);
+    TRACE("Alarm timeout id=%d\n", id);
     
     if ( id == TIMEOUT_ON_AC_ID && brg->priv->on_ac_timeout != 9)
     {
@@ -359,8 +360,8 @@
 static void
 xfpm_brightness_hal_set_timeouts (XfpmBrightnessHal *brg )
 {
-    xfpm_idle_new_alarm (brg->priv->idle, TIMEOUT_ON_AC_ID, brg->priv->on_ac_timeout * 1000);
-    xfpm_idle_new_alarm (brg->priv->idle, TIMEOUT_ON_BATTERY_ID, brg->priv->on_battery_timeout * 1000);
+    xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_ON_AC_ID, brg->priv->on_ac_timeout * 1000);
+    xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_ON_BATTERY_ID, brg->priv->on_battery_timeout * 1000);
     
     xfpm_idle_alarm_reset_all (brg->priv->idle);
 }
@@ -383,7 +384,9 @@
 	    g_warning ("Value %d for %s is out of range", val, BRIGHTNESS_ON_AC );
 	}
 	else
+	{
 	    brg->priv->on_ac_timeout = val;
+	}
 	set = TRUE;
     }
     else if ( xfpm_strequal (property, BRIGHTNESS_ON_BATTERY ) )

Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c	2009-03-16 16:36:48 UTC (rev 6920)
@@ -200,6 +200,7 @@
 static void
 xfpm_engine_on_battery_cb (XfpmSupply *supply, gboolean on_battery, XfpmEngine *engine)
 {
+    TRACE("%s\n", xfpm_bool_to_string (on_battery)); 
     engine->priv->on_battery = on_battery;
 #ifdef HAVE_DPMS
     xfpm_dpms_set_on_battery (engine->priv->dpms, on_battery);
@@ -303,13 +304,7 @@
     engine->priv->cpu = xfpm_cpu_new ();
 
     engine->priv->supply = xfpm_supply_new (engine->priv->power_management);
-
-    g_signal_connect (G_OBJECT(engine->priv->supply), "shutdown-request",
-		      G_CALLBACK (xfpm_engine_shutdown_request_battery_cb), engine);
-
-    g_signal_connect (G_OBJECT(engine->priv->supply), "on-battery",
-		      G_CALLBACK (xfpm_engine_on_battery_cb), engine);
-		      
+    
     /*
      * Keys from XF86
      */
@@ -332,6 +327,14 @@
      */
     engine->priv->brg_hal = xfpm_brightness_hal_new ();
     
+    g_signal_connect (G_OBJECT(engine->priv->supply), "shutdown-request",
+		      G_CALLBACK (xfpm_engine_shutdown_request_battery_cb), engine);
+
+    g_signal_connect (G_OBJECT(engine->priv->supply), "on-battery",
+		      G_CALLBACK (xfpm_engine_on_battery_cb), engine);
+		      
+    xfpm_supply_monitor (engine->priv->supply);
+    
 }
 
 static void

Modified: xfce4-power-manager/trunk/src/xfpm-idle.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-idle.c	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/src/xfpm-idle.c	2009-03-16 16:36:48 UTC (rev 6920)
@@ -319,7 +319,7 @@
 }
 
 gboolean 
-xfpm_idle_new_alarm (XfpmIdle *idle, guint id, guint timeout)
+xfpm_idle_set_alarm (XfpmIdle *idle, guint id, guint timeout)
 {
     IdleAlarm *alarm;
     
@@ -336,9 +336,10 @@
     if ( !alarm )
     {
 	alarm = xfpm_idle_new_alarm_internal (idle, id);
-	XSyncIntToValue (&alarm->timeout, timeout);
-	xfpm_idle_xsync_alarm_set (idle, alarm, TRUE);
     }
+    
+    XSyncIntToValue (&alarm->timeout, timeout);
+    xfpm_idle_xsync_alarm_set (idle, alarm, TRUE);
     return TRUE;
 }
 

Modified: xfce4-power-manager/trunk/src/xfpm-idle.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-idle.h	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/src/xfpm-idle.h	2009-03-16 16:36:48 UTC (rev 6920)
@@ -52,7 +52,7 @@
 GType        		  xfpm_idle_get_type        (void) G_GNUC_CONST;
 XfpmIdle       		 *xfpm_idle_new             (void);
 
-gboolean                  xfpm_idle_new_alarm       (XfpmIdle *idle,
+gboolean                  xfpm_idle_set_alarm       (XfpmIdle *idle,
 						     guint id,
 						     guint timeout);
 						     

Modified: xfce4-power-manager/trunk/src/xfpm-supply.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-supply.c	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/src/xfpm-supply.c	2009-03-16 16:36:48 UTC (rev 6920)
@@ -695,6 +695,7 @@
 		      G_CALLBACK(xfpm_supply_adapter_changed_cb), supply);
     
     supply->priv->adapter_present = xfpm_adapter_get_presence (supply->priv->adapter);
+    g_signal_emit (G_OBJECT(supply), signals[ON_BATTERY], 0, !supply->priv->adapter_present);
 }
 
 static void
@@ -841,9 +842,13 @@
     XfpmSupply *supply = NULL;
     supply = g_object_new(XFPM_TYPE_SUPPLY,NULL);
     
-    
     supply->priv->power_management = power_management_info;
     
+    return supply;
+}
+
+void xfpm_supply_monitor (XfpmSupply *supply)
+{
     xfpm_supply_load_configuration (supply);
       
     g_signal_connect (supply->priv->conf->channel, "property-changed", 
@@ -862,5 +867,4 @@
 		     
     g_signal_connect(supply->priv->power, "adapter-removed",
 		     G_CALLBACK(xfpm_supply_adapter_removed_cb), supply);
-    return supply;
 }

Modified: xfce4-power-manager/trunk/src/xfpm-supply.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-supply.h	2009-03-16 14:39:17 UTC (rev 6919)
+++ xfce4-power-manager/trunk/src/xfpm-supply.h	2009-03-16 16:36:48 UTC (rev 6920)
@@ -61,7 +61,7 @@
 GType   	         xfpm_supply_get_type       (void) G_GNUC_CONST;
 
 XfpmSupply     	        *xfpm_supply_new            (guint8 power_management_info);
-						     
+void                     xfpm_supply_monitor        (XfpmSupply *supply);
 G_END_DECLS
 
 #endif /* __XFPM_SUPPLY_H */




More information about the Goodies-commits mailing list