summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2008-10-27 11:52:47 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-27 11:52:47 +0000
commit5ed940e101d81fd1cbcca87df48242a51d449389 (patch)
tree2898140d90e6fdff46dcc76eaf164a874a3ce558 /src/ui
parent11f18a25c2bdda224ea98bdcbdb73889ef09cdd5 (diff)
downloadmetacity-5ed940e101d81fd1cbcca87df48242a51d449389.tar.gz
metacity-5ed940e101d81fd1cbcca87df48242a51d449389.tar.bz2
Fix some crashes with the new GDM 2.24. Closes #558058.
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
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/ui.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/ui.c b/src/ui/ui.c
index b72f114..010130c 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -850,7 +850,7 @@ meta_ui_parse_modifier (const char *accel,
*mask = 0;
- if (strcmp (accel, "disabled") == 0)
+ if (accel == NULL || strcmp (accel, "disabled") == 0)
return TRUE;
meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);