Index: gnome-panel/gnome-panel/menu.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu.c,v
retrieving revision 1.600.2.2
diff -u -p -r1.600.2.2 menu.c
--- gnome-panel/gnome-panel/menu.c	4 Aug 2002 21:50:00 -0000	1.600.2.2
+++ gnome-panel/gnome-panel/menu.c	9 Aug 2002 03:25:47 -0000
@@ -906,11 +906,6 @@ load_icons_handler_again:
 	return TRUE;
 }
 
-#ifdef FIXME
-/* FIXME:
- *    Disabled for 2.0.0 because menu editing just
- * doesn't work. Re-enable in future.
- */
 static void
 add_new_app_to_menu (GtkWidget *widget, const char *item_loc)
 {
@@ -1000,7 +995,6 @@ remove_menuitem (GtkWidget *widget, Show
 		gnome_desktop_item_unref (ditem);
 	}
 }
-#endif /* FIXME */
 
 static void
 add_to_run_dialog (GtkWidget    *widget,
@@ -1267,11 +1261,6 @@ restore_grabs(GtkWidget *w, gpointer dat
 	gtk_grab_add (GTK_WIDGET (menu));
 }
 
-#ifdef FIXME
-/* FIXME:
- *    Disabled for 2.0.0 because menu editing just
- * doesn't work. Re-enable in future.
- */
 static void
 edit_dentry (GtkWidget    *widget,
 	     ShowItemMenu *sim)
@@ -1297,7 +1286,6 @@ edit_direntry (GtkWidget    *widget,
 	panel_edit_direntry (sim->mf->menudir,
 			     sim->mf->dir_name);
 }
-#endif /* FIXME */
 
 static void
 show_item_menu (GtkWidget *item, GdkEventButton *bevent, ShowItemMenu *sim)
@@ -1321,9 +1309,7 @@ show_item_menu (GtkWidget *item, GdkEven
 				  item);
 
 		if (sim->type == 1) {
-#ifdef FIXME
 			char *tmp;
-#endif
 
 			ii = gnome_desktop_item_new_from_uri (sim->item_loc, 0, NULL);
 
@@ -1342,12 +1328,6 @@ show_item_menu (GtkWidget *item, GdkEven
 					  G_CALLBACK (add_app_to_panel),
 					  sim);
 
-#ifdef FIXME
-			/* FIXME:
-			 *    Disabled for 2.0.0 because menu editing just
-			 * doesn't work. Re-enable in future.
-			 */
-			
 			menuitem = gtk_image_menu_item_new ();
 			setup_menuitem (menuitem, NULL,
 					_("Remove this item"));
@@ -1363,7 +1343,6 @@ show_item_menu (GtkWidget *item, GdkEven
 						   "activate",
 						   G_CALLBACK (gtk_menu_shell_deactivate),
 						   G_OBJECT (item->parent));
-#endif /* FIXME */
 
 			menuitem = gtk_image_menu_item_new ();
 			setup_menuitem (menuitem, NULL,
@@ -1400,11 +1379,6 @@ show_item_menu (GtkWidget *item, GdkEven
 					 		   G_OBJECT(item->parent));
 			}
 
-#ifdef FIXME
-			/* FIXME:
-			 *    Disabled for 2.0.0 because menu editing just
-			 * doesn't work. Re-enable in future.
-			 */
 			menuitem = gtk_image_menu_item_new ();
 			/*when activated we must pop down the first menu*/
 			g_signal_connect_swapped (G_OBJECT (menuitem),
@@ -1418,7 +1392,6 @@ show_item_menu (GtkWidget *item, GdkEven
 					   sim);
 			setup_menuitem (menuitem, NULL, _("_Properties"));
 			gtk_menu_shell_append (GTK_MENU_SHELL (sim->menu), menuitem);
-#endif /* FIXME */
 
 			gnome_desktop_item_unref (ii);
 		}
@@ -1459,11 +1432,6 @@ show_item_menu (GtkWidget *item, GdkEven
 					   G_CALLBACK(add_menu_to_panel),
 					   sim->mf->menudir);
 
-#ifdef FIXME
-			/* FIXME:
-			 *    Disabled for 2.0.0 because menu editing just
-			 * doesn't work. Re-enable in future.
-			 */
 			menuitem = gtk_image_menu_item_new ();
 			setup_menuitem (menuitem, NULL,
 					_("Add new item to this menu"));
@@ -1493,7 +1461,6 @@ show_item_menu (GtkWidget *item, GdkEven
 					    sim);
 			setup_menuitem (menuitem, NULL, _("Properties"));
 			gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem);
-#endif /* FIXME */
 		}
 	}
 
