isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix some crashes with the new GDM 2.24. Closes #558058.

Browse Source 
2008-10-27  Brian Cameron  <brian.cameron@sun.com>

        Fix some crashes with the new GDM 2.24.  Closes #558058.

        * src/ui/ui.c (meta_ui_parse_modifier): another null check
        * src/core/prefs.c (titlebar_handler, button_layout_handler):
          more null checks.


svn path=/trunk/; revision=4003
This commit is contained in:
Brian Cameron 2008-10-27 11:52:47 +00:00 committed by Thomas James Alexander Thurman
parent 11f18a25c2
commit 5ed940e101
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-10-27 Brian Cameron <brian.cameron@sun.com>
Fix some crashes with the new GDM 2.24. Closes #558058.
* src/ui/ui.c (meta_ui_parse_modifier): another null check
* src/core/prefs.c (titlebar_handler, button_layout_handler):
more null checks.
2008-10-26 Thomas Thurman <tthurman@gnome.org> 2008-10-26 Thomas Thurman <tthurman@gnome.org>
* src/core/prefs.c (mouse_button_mods_handler): Ignore values * src/core/prefs.c (mouse_button_mods_handler): Ignore values

14
src/core/prefs.c
View File

@ -1326,13 +1326,14 @@ titlebar_handler (MetaPreference pref,
{ {
PangoFontDescription *new_desc; PangoFontDescription *new_desc;
new_desc = pango_font_description_from_string (string_value); if (string_value)
new_desc = pango_font_description_from_string (string_value);
if (new_desc == NULL) if (new_desc == NULL)
{ {
meta_warning (_("Could not parse font description " meta_warning (_("Could not parse font description "
"\"%s\" from GConf key %s\n"), "\"%s\" from GConf key %s\n"),
string_value, string_value ? string_value : "(null)",
KEY_TITLEBAR_FONT); KEY_TITLEBAR_FONT);
*inform_listeners = FALSE; *inform_listeners = FALSE;
@ -1476,16 +1477,17 @@ button_layout_handler (MetaPreference pref,
gboolean *inform_listeners) gboolean *inform_listeners)
{ {
MetaButtonLayout new_layout; MetaButtonLayout new_layout;
char **sides; char **sides = NULL;
int i; int i;
/* We need to ignore unknown button functions, for /* We need to ignore unknown button functions, for
* compat with future versions * compat with future versions
*/ */
sides = g_strsplit (string_value, ":", 2); if (string_value)
sides = g_strsplit (string_value, ":", 2);
if (sides[0] != NULL) if (sides != NULL && sides[0] != NULL)
{ {
char **buttons; char **buttons;
int b; int b;
@ -1545,7 +1547,7 @@ button_layout_handler (MetaPreference pref,
g_strfreev (buttons); g_strfreev (buttons);
} }
if (sides[0] != NULL && sides[1] != NULL) if (sides != NULL && sides[0] != NULL && sides[1] != NULL)
{ {
char **buttons; char **buttons;
int b; int b;

2
src/ui/ui.c
View File

@ -850,7 +850,7 @@ meta_ui_parse_modifier (const char *accel,
*mask = 0; *mask = 0;
if (strcmp (accel, "disabled") == 0) if (accel == NULL || strcmp (accel, "disabled") == 0)
return TRUE; return TRUE;
meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask); meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);