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

Fixes #356074

Browse source 
2006-09-15  Rodrigo Moya <rodrigo@novell.com>

	Fixes #356074

	* gnome-keyboard-properties-xkb.c (set_model_text): make sure 'model'
	is never NULL. Original patch from Brian Cameron <brian.cameron@sun.com>.
This commit is contained in:
Rodrigo Moya 2006-09-15 11:04:17 +00:00 • committed by Rodrigo Moya
parent 3ec36c725f
commit 6534f723c6
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,10 @@
2006-09-15 Rodrigo Moya <rodrigo@novell.com>
Fixes #356074
* gnome-keyboard-properties-xkb.c (set_model_text): make sure 'model'
is never NULL. Original patch from Brian Cameron <brian.cameron@sun.com>.
2006-08-07 Rodrigo Moya <rodrigo@novell.com> 2006-08-07 Rodrigo Moya <rodrigo@novell.com>
Fixes #348847 Fixes #348847

4
capplets/keyboard/gnome-keyboard-properties-xkb.c
View file

@ -70,7 +70,11 @@ set_model_text (GtkWidget * entry,
} }
if (model == NULL) if (model == NULL)
{
model = initial_config.model; model = initial_config.model;
if (model == NULL)
model = "";
}
g_snprintf (ci.name, sizeof (ci.name), "%s", model); g_snprintf (ci.name, sizeof (ci.name), "%s", model);