--- xfce4-power-manager-0.8.5.orig/src/xfpm-engine.c	2010-03-02 07:17:02.000000000 -0800
+++ xfce4-power-manager-0.8.5/src/xfpm-engine.c	2010-06-20 14:58:08.974839991 -0700
@@ -235,6 +235,7 @@
 xfpm_engine_lid_event (XfpmButtonHal *bt_hal, gboolean pressed, XfpmEngine *engine)
 {
     XfpmLidTriggerAction action;
+    gboolean is_multi_conn;
     
     g_object_get (G_OBJECT (engine->priv->conf),
 		      engine->priv->on_battery ? LID_SWITCH_ON_BATTERY_CFG : LID_SWITCH_ON_AC_CFG, &action,
@@ -244,6 +245,19 @@
     {
 	XFPM_DEBUG_ENUM ("LID close event", action, XFPM_TYPE_LID_TRIGGER_ACTION);
 	
+        is_multi_conn = xfpm_is_multihead_connected();
+        switch(action) {
+            case LID_TRIGGER_LOCK_SCREEN:
+                if (!is_multi_conn)
+                    xfpm_lock_screen();
+            case LID_TRIGGER_NOTHING:
+                if (!is_multi_conn)
+                    xfpm_dpms_force_level(engine->priv->dpms, DPMSModeOff);
+                break;
+            default:
+                xfpm_engine_shutdown_request (engine, action, FALSE);
+        }
+/*
 	if ( action == LID_TRIGGER_NOTHING )
 	{
 	    if ( !xfpm_is_multihead_connected () )
@@ -256,6 +270,7 @@
 	}
 	else 
 	    xfpm_engine_shutdown_request (engine, action, FALSE);
+*/
     }
     else
     {