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

[Ali Abdallah]

Author: aliov
Date: 2008-10-16 12:21:00 +0000 (Thu, 16 Oct 2008)
New Revision: 5645

Modified:
   xfce4-power-manager/trunk/src/xfpm-button.c
   xfce4-power-manager/trunk/src/xfpm-driver.c
Log:
Fix a bug when proccessing shutdown request

Modified: xfce4-power-manager/trunk/src/xfpm-button.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button.c	2008-10-16 12:17:32 UTC (rev 5644)
+++ xfce4-power-manager/trunk/src/xfpm-button.c	2008-10-16 12:21:00 UTC (rev 5645)
@@ -322,12 +322,11 @@
     }
     else if ( action == XFPM_DO_SHUTDOWN )
     {
-        XFPM_DEBUG("Processing\n");
         XfpmButtonPrivate *priv;
         priv = XFPM_BUTTON_GET_PRIVATE(bt);
         g_signal_handler_block(priv->hal,priv->handler_id);
     
-        g_signal_emit(G_OBJECT(bt),signals[XFPM_ACTION_REQUEST],0,XFPM_DO_HIBERNATE,FALSE);
+        g_signal_emit(G_OBJECT(bt),signals[XFPM_ACTION_REQUEST],0,XFPM_DO_SHUTDOWN,FALSE);
         
         g_timeout_add(10,(GSourceFunc)_unblock_handler,priv);
         

Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-16 12:17:32 UTC (rev 5644)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-16 12:21:00 UTC (rev 5645)
@@ -661,7 +661,7 @@
     if (!xfpm_hal_shutdown(priv->hal))
     {
 #ifdef HAVE_LIBNOTIFY        
-         xfpm_driver_report_sleep_errors(drv,"gpm-hibernate",_("System failed to shutdown"));
+         xfpm_driver_report_sleep_errors(drv,"gpm-ac-adapter",_("System failed to shutdown"));
 #endif         
     }
     
@@ -722,6 +722,7 @@
     }
 
     /* Block any other event here */    
+    /*
     priv->accept_sleep_request = FALSE;    
     
     switch ( action )
@@ -737,7 +738,7 @@
             break;    
         default:
             break;
-    }        
+    } */       
     
 }