diff options
author | Matthias Clasen <mclasen@redhat.com> | 2007-12-09 23:03:45 +0000 |
---|---|---|
committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2007-12-09 23:03:45 +0000 |
commit | e7dc04d28ef1d38468888a17a3257282e8881d22 (patch) | |
tree | b400ed5705b1a0db392f1fa437a1baa56830e513 | |
parent | 4564236abf0f80eca24046eec88554f4c343066c (diff) | |
download | metacity-e7dc04d28ef1d38468888a17a3257282e8881d22.tar.gz |
check for null before adding menu; closes #496054.
2007-12-08 Matthias Clasen <mclasen@redhat.com>
* src/menu.c (meta_window_menu_new): check for null before adding
menu; closes #496054.
svn path=/trunk/; revision=3465
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | src/menu.c | 8 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-12-08 Matthias Clasen <mclasen@redhat.com> + + * src/menu.c (meta_window_menu_new): check for null before adding + menu; closes #496054. + 2007-12-08 Thomas Thurman <tthurman@gnome.org> * src/keybindings.c (meta_display_process_key_event): Recur if the @@ -474,10 +474,12 @@ meta_window_menu_new (MetaFrames *frames, g_free, FALSE, FALSE); } - - gtk_menu_shell_append (GTK_MENU_SHELL (menu->menu), mi); + if (mi) + { + gtk_menu_shell_append (GTK_MENU_SHELL (menu->menu), mi); - gtk_widget_show (mi); + gtk_widget_show (mi); + } } } |