applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added handler for media keybinding. Add defines for media key.

Browse source 
2007-03-20  Priit Laes  <plaes@svn.gnome.org>

	* gnome-settings-multimedia-keys.c: (do_media_action), (do_action): Added
	handler for media keybinding.
	* actions/acme.h: Add defines for media key.

	Introduces preferred media application support. Bug #362578.

svn path=/trunk/; revision=7404
This commit is contained in:
Priit Laes 2007-03-20 19:01:26 +00:00 • committed by Priit Laes
parent fe4665e55f
commit a0427192af
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,11 @@
2007-03-20 Priit Laes <plaes@svn.gnome.org>
* gnome-settings-multimedia-keys.c: (do_media_action), (do_action): Added
handler for media keybinding.
* actions/acme.h: Add defines for media key.
Introduces preferred media application support. Bug #362578.
2007-03-18 Jens Granseuer <jensgr@gmx.net> 2007-03-18 Jens Granseuer <jensgr@gmx.net>
* gnome-settings-multimedia-keys.c: (dialog_show): fix multimedia * gnome-settings-multimedia-keys.c: (dialog_show): fix multimedia

2
gnome-settings-daemon/actions/acme.h
View file

@ -32,6 +32,7 @@ enum {
POWER_KEY, POWER_KEY,
EJECT_KEY, EJECT_KEY,
HOME_KEY, HOME_KEY,
MEDIA_KEY,
SEARCH_KEY, SEARCH_KEY,
EMAIL_KEY, EMAIL_KEY,
SLEEP_KEY, SLEEP_KEY,
@ -63,6 +64,7 @@ static struct {
{ POWER_KEY, GCONF_BINDING_DIR "/power", NULL }, { POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL }, { EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, { HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
{ MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL },
{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
{ EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL }, { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL },
{ SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL },

14
gnome-settings-daemon/gnome-settings-multimedia-keys.c
View file

@ -458,6 +458,17 @@ do_mail_action (Acme *acme)
g_free (string); g_free (string);
} }
static void
do_media_action (Acme *acme)
{
char *command;
command = gconf_client_get_string (acme->conf_client,
GCONF_MISC_DIR "/eject_command", NULL);
if ((command != NULL) && (strcmp (command, "") != 0))
execute (command, FALSE);
g_free (command);
}
static void static void
do_www_action (Acme *acme, const char *url) do_www_action (Acme *acme, const char *url)
{ {
@ -616,6 +627,9 @@ do_action (Acme *acme, int type)
case WWW_KEY: case WWW_KEY:
do_www_action (acme, NULL); do_www_action (acme, NULL);
break; break;
case MEDIA_KEY:
do_media_action (acme);
break;
case PLAY_KEY: case PLAY_KEY:
return do_multimedia_player_action (acme, "Play"); return do_multimedia_player_action (acme, "Play");
break; break;