[gnome-settings-daemon] Remove sleep keybindings
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] Remove sleep keybindings
- Date: Tue, 15 Dec 2009 14:19:00 +0000 (UTC)
commit d6c357365eec6aa9c51d91ce124191244aca5c6c
Author: Bastien Nocera <hadess hadess net>
Date: Tue Dec 15 14:17:32 2009 +0000
Remove sleep keybindings
Running "apm" -> bad
It's also pretty useless because the sleep button is already
handled through other means in gnome-power-manager, etc.
https://bugzilla.gnome.org/show_bug.cgi?id=170175
...ps_gnome_settings_daemon_keybindings.schemas.in | 12 ------------
plugins/media-keys/acme.h | 2 --
plugins/media-keys/gsd-media-keys-manager.c | 9 ---------
3 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/data/apps_gnome_settings_daemon_keybindings.schemas.in b/data/apps_gnome_settings_daemon_keybindings.schemas.in
index ac3e312..c583ae3 100644
--- a/data/apps_gnome_settings_daemon_keybindings.schemas.in
+++ b/data/apps_gnome_settings_daemon_keybindings.schemas.in
@@ -110,18 +110,6 @@
<schema>
- <key>/schemas/apps/gnome_settings_daemon/keybindings/sleep</key>
- <applyto>/apps/gnome_settings_daemon/keybindings/sleep</applyto>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short>Suspend</short>
- <long>Binding to suspend the computer.</long>
- </locale>
- </schema>
-
-
- <schema>
<key>/schemas/apps/gnome_settings_daemon/keybindings/screensaver</key>
<applyto>/apps/gnome_settings_daemon/keybindings/screensaver</applyto>
<type>string</type>
diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
index 60f9beb..ef602fe 100644
--- a/plugins/media-keys/acme.h
+++ b/plugins/media-keys/acme.h
@@ -37,7 +37,6 @@ enum {
CALCULATOR_KEY,
SEARCH_KEY,
EMAIL_KEY,
- SLEEP_KEY,
SCREENSAVER_KEY,
HELP_KEY,
WWW_KEY,
@@ -64,7 +63,6 @@ static struct {
{ CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL },
{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
{ EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL },
- { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL },
{ SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL },
{ HELP_KEY, GCONF_BINDING_DIR "/help", NULL },
{ WWW_KEY, GCONF_BINDING_DIR "/www", NULL },
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 0d44b5f..5b0290a 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -69,12 +69,6 @@
# define EJECT_COMMAND "eject -T"
#endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
-# define SLEEP_COMMAND "zzz"
-#else
-# define SLEEP_COMMAND "apm"
-#endif
-
#define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
typedef struct {
@@ -896,9 +890,6 @@ do_action (GsdMediaKeysManager *manager,
case EMAIL_KEY:
do_mail_action (manager);
break;
- case SLEEP_KEY:
- do_sleep_action (SLEEP_COMMAND, "xset dpms force off");
- break;
case SCREENSAVER_KEY:
if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {
execute (manager, "gnome-screensaver-command --lock", FALSE, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]