Fix segfault introduced with --nodesktop

This commit is contained in:
Pavel Machek 2000-01-31 15:29:33 +00:00
parent 8dcb55ce88
commit 4a1dcb109b
2 changed files with 4 additions and 0 deletions

View File

@ -3,6 +3,7 @@
* gicon.c (gicon_init): make missing icons non-fatal error * gicon.c (gicon_init): make missing icons non-fatal error
* gmain.c, gdesktop.c: added option not to display desktop icons * gmain.c, gdesktop.c: added option not to display desktop icons
(desktop_popup): don't handle clicks when --nodesktop
2000-01-26 Federico Mena Quintero <federico@helixcode.com> 2000-01-26 Federico Mena Quintero <federico@helixcode.com>

View File

@ -2707,6 +2707,9 @@ desktop_popup (GdkEventButton *event)
/* Create the menu and then strip the tearoff menu items, sigh... */ /* Create the menu and then strip the tearoff menu items, sigh... */
if (nodesktop)
return;
popup = gnome_popup_menu_new (desktop_popup_items); popup = gnome_popup_menu_new (desktop_popup_items);
strip_tearoff_menu_item (desktop_arrange_icons_items); strip_tearoff_menu_item (desktop_arrange_icons_items);