From 7def256ed5f53e3ecec9d2ff2acb2e5069dce436 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Mon, 22 Oct 2007 18:59:37 +0000 Subject: [PATCH] Based on a patch by: Sebastien Bacher 2007-10-22 Jens Granseuer Based on a patch by: Sebastien Bacher * capplets/keybindings/00-multimedia-key.xml.in: * gnome-settings-daemon/action/acme.h: * gnome-settings-daemon/gnome-settings-multimedia-keys.c (do_action): * schemas/apps_gnome_settings_daemon_keybindings.schemas.in: add support for calculator key svn path=/trunk/; revision=8187 --- ChangeLog | 10 ++++++++++ capplets/keybindings/00-multimedia-key.xml.in | 3 +++ gnome-settings-daemon/actions/acme.h | 2 ++ .../gnome-settings-multimedia-keys.c | 3 +++ .../apps_gnome_settings_daemon_keybindings.schemas.in | 11 +++++++++++ 5 files changed, 29 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3d1c4b68e..0dcee4f0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-10-22 Jens Granseuer + + Based on a patch by: Sebastian Bacher + + * capplets/keybindings/00-multimedia-key.xml.in: + * gnome-settings-daemon/action/acme.h: + * gnome-settings-daemon/gnome-settings-multimedia-keys.c (do_action): + * schemas/apps_gnome_settings_daemon_keybindings.schemas.in: + add support for calculator key + 2007-10-21 Jens Granseuer * configure.in: fix bugzilla component diff --git a/capplets/keybindings/00-multimedia-key.xml.in b/capplets/keybindings/00-multimedia-key.xml.in index b3d16819d..48033943f 100644 --- a/capplets/keybindings/00-multimedia-key.xml.in +++ b/capplets/keybindings/00-multimedia-key.xml.in @@ -13,6 +13,9 @@ + + diff --git a/gnome-settings-daemon/actions/acme.h b/gnome-settings-daemon/actions/acme.h index ddcb4bcb3..b2f2e712b 100644 --- a/gnome-settings-daemon/actions/acme.h +++ b/gnome-settings-daemon/actions/acme.h @@ -33,6 +33,7 @@ enum { EJECT_KEY, HOME_KEY, MEDIA_KEY, + CALCULATOR_KEY, SEARCH_KEY, EMAIL_KEY, SLEEP_KEY, @@ -65,6 +66,7 @@ static struct { { EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL }, { HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, { MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL }, + { 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 }, diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c index b6c03a707..a09d28c4e 100644 --- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c +++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c @@ -727,6 +727,9 @@ do_action (Acme *acme, int type) case MEDIA_KEY: do_media_action (acme); break; + case CALCULATOR_KEY: + execute (acme, "gcalctool", FALSE, FALSE); + break; case PLAY_KEY: return do_multimedia_player_action (acme, "Play"); break; diff --git a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in index a00cd1345..66545ee21 100644 --- a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +++ b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in @@ -144,6 +144,17 @@ + + /schemas/apps/gnome_settings_daemon/keybindings/calculator + /apps/gnome_settings_daemon/keybindings/calculator + string + XF86Calculator + + Launch calculator + Launch calculator's shortcut + + + /schemas/apps/gnome_settings_daemon/keybindings/www