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

Fixes #323690

Browse source 
2005-12-12  Philippe Troin <phil@fifi.org>

	Fixes #323690

	* gnome-settings-multimedia-keys.c (update_kbd_cb, init_kbd): don't
	grab keyboard when invalid keys are present in the GConf database.
This commit is contained in:
Philippe Troin 2005-12-12 15:39:41 +00:00 • committed by Rodrigo Moya
parent 64e9ba3cb5
commit 38047c8ff5
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,10 @@
2005-12-12 Philippe Troin <phil@fifi.org>
Fixes #323690
* gnome-settings-multimedia-keys.c (update_kbd_cb, init_kbd): don't
grab keyboard when invalid keys are present in the GConf database.
2005-11-21 Jens Granseuer <jensgr@gmx.net>
Fixes #321778

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

@ -333,7 +333,8 @@ update_kbd_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
break;
key = g_new0 (Key, 1);
if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE)
if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
|| key->keycode == 0)
{
g_free (key);
break;
@ -369,7 +370,8 @@ update_kbd_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
break;
key = g_new0 (Key, 1);
if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE)
if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
|| key->keycode == 0)
{
g_free (key);
break;
@ -446,7 +448,8 @@ init_kbd (Acme *acme)
}
key = g_new0 (Key, 1);
if (!egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state))
if (!egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state)
|| key->keycode == 0)
{
g_free (tmp);
g_free (key);
@ -476,7 +479,8 @@ init_kbd (Acme *acme)
}
key = g_new0 (Key, 1);
if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE)
if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
|| key->keycode == 0)
{
g_free (tmp);
g_free (key);