[gnome-power-manager] Do not handle the lock key, it's now done in gnome-settings-daemon



commit 333986da01a0e7ebd4d809a822c93433a2883b50
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 4 12:27:48 2011 +0100

    Do not handle the lock key, it's now done in gnome-settings-daemon

 src/gpm-button.c  |    1 -
 src/gpm-button.h  |    1 -
 src/gpm-manager.c |    4 ----
 3 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/src/gpm-button.c b/src/gpm-button.c
index 5345160..1fa947b 100644
--- a/src/gpm-button.c
+++ b/src/gpm-button.c
@@ -319,7 +319,6 @@ gpm_button_init (GpmButton *button)
 
 	gpm_button_xevent_key (button, XF86XK_MonBrightnessUp, GPM_BUTTON_BRIGHT_UP);
 	gpm_button_xevent_key (button, XF86XK_MonBrightnessDown, GPM_BUTTON_BRIGHT_DOWN);
-	gpm_button_xevent_key (button, XF86XK_ScreenSaver, GPM_BUTTON_LOCK);
 
 	/* use global filter */
 	gdk_window_add_filter (button->priv->window,
diff --git a/src/gpm-button.h b/src/gpm-button.h
index bf226ac..a19bf3f 100644
--- a/src/gpm-button.h
+++ b/src/gpm-button.h
@@ -40,7 +40,6 @@ typedef struct GpmButtonPrivate GpmButtonPrivate;
 #define GPM_BUTTON_LID_CLOSED		"lid-down"
 #define GPM_BUTTON_BRIGHT_UP		"brightness-up"
 #define GPM_BUTTON_BRIGHT_DOWN		"brightness-down"
-#define GPM_BUTTON_LOCK			"lock"
 #define GPM_BUTTON_BATTERY		"battery"
 
 typedef struct
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 51d52be..5532ed4 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -992,10 +992,6 @@ gpm_manager_button_pressed_cb (GpmButton *button, const gchar *type, GpmManager
 		gpm_manager_lid_button_pressed (manager, TRUE);
 	}
 
-	/* really belongs in gnome-screensaver */
-	if (g_strcmp0 (type, GPM_BUTTON_LOCK) == 0)
-		gpm_screensaver_lock (manager->priv->screensaver);
-
 	/* disable or enable the fancy screensaver, as we don't want
 	 * this starting when the lid is shut */
 	if (g_strcmp0 (type, GPM_BUTTON_LID_CLOSED) == 0)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]