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

[Ali Abdallah]

Author: aliov
Date: 2009-03-18 23:12:31 +0000 (Wed, 18 Mar 2009)
New Revision: 6947

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/src/xfpm-engine.c
Log:
Fix a bug regarding the network manager message sleep

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-03-18 22:29:34 UTC (rev 6946)
+++ xfce4-power-manager/trunk/ChangeLog	2009-03-18 23:12:31 UTC (rev 6947)
@@ -1,4 +1,7 @@
 
+2009-03-19  0:12 Ali aliov at xfce.org 
+	 * : Fix a bug regarding the network manager message sleep
+
 2009-03-18 23:29 Ali aliov at xfce.org 
 	 * : Doing hibernate/suspend in a timeout function
 

Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c	2009-03-18 22:29:34 UTC (rev 6946)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c	2009-03-18 23:12:31 UTC (rev 6947)
@@ -121,7 +121,7 @@
 	g_warning ("%s", error->message);
 	g_error_free (error);
     }
-    
+    xfpm_send_message_to_network_manager ("wake");
     return FALSE;
 }
 
@@ -137,7 +137,7 @@
 	g_warning ("%s", error->message);
 	g_error_free (error);
     }
-    
+    xfpm_send_message_to_network_manager ("wake");
     return FALSE;
 }
 
@@ -153,14 +153,12 @@
 	g_warning ("%s", error->message);
 	g_error_free (error);
     }
-    
     return FALSE;
 }
 
 static void
 xfpm_engine_shutdown_request (XfpmEngine *engine, XfpmShutdownRequest shutdown)
 {
-    
     const gchar *action = xfpm_int_to_shutdown_string (shutdown);
 	
     if ( xfpm_strequal(action, "Nothing") )
@@ -189,7 +187,6 @@
 	if ( engine->priv->lock_screen )
 	    xfpm_lock_screen ();
 	
-	xfpm_send_message_to_network_manager ("wake");
     }
 }
 
@@ -302,6 +299,8 @@
 	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);
     xfpm_supply_monitor (engine->priv->supply);
     
     /*
@@ -333,10 +332,7 @@
     {
 	engine->priv->brg_hal = xfpm_brightness_hal_new ();
 	engine->priv->has_lcd_brightness = xfpm_brightness_hal_has_hw (engine->priv->brg_hal);
-	if ( engine->priv->has_lcd_brightness )
-	    g_signal_connect (G_OBJECT(engine->priv->supply), "shutdown-request",
-			      G_CALLBACK (xfpm_engine_shutdown_request_battery_cb), engine);
-	else
+	if ( !engine->priv->has_lcd_brightness )
 	    g_object_unref (engine->priv->brg_hal);
     }
 }