Added bug numbers to FIXMEs, and removed a few stale ones.

	* components/music/nautilus-music-view.c:
	* components/services/trilobite/libtrilobite/trilobite-service.c:
	* src/nautilus-window-menus.c: (update_user_level_menu_items):
	* src/nautilus-window.c: (nautilus_window_constructed),
	(nautilus_window_real_set_content_view):
	Added bug numbers to FIXMEs, and removed a few stale ones.

9 files changed, 77 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index f4a712464..eb3f731ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2000-06-06  John Sullivan  <sullivan@eazel.com>
 
+	* components/music/nautilus-music-view.c:
+	* components/services/trilobite/libtrilobite/trilobite-service.c:
+	* src/nautilus-window-menus.c: (update_user_level_menu_items):
+	* src/nautilus-window.c: (nautilus_window_constructed),
+	(nautilus_window_real_set_content_view):
+	Added bug numbers to FIXMEs, and removed a few stale ones.
+
+2000-06-06  John Sullivan  <sullivan@eazel.com>
+
 	* libnautilus-extensions/nautilus-metadata.h:
 	* libnautilus-extensions/nautilus-mime-actions.c:
 	(nautilus_mime_get_default_action_type_for_uri),
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index 836bbe79e..ff87b13c7 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -347,7 +347,6 @@ music_view_set_selected_song_title (NautilusMusicView *music_view, int row)
 
 
 /* handle a row being selected in the list view by playing the corresponding song */
-/* FIXME bugzilla.eazel.com 721: xmms shouldn't be hardwired */
 static void 
 selection_callback(GtkCList * clist, int row, int column, GdkEventButton * event, NautilusMusicView* music_view)
 {
diff --git a/components/services/trilobite/libtrilobite/trilobite-service.c b/components/services/trilobite/libtrilobite/trilobite-service.c
index 6549106d3..43705f6bb 100644
--- a/components/services/trilobite/libtrilobite/trilobite-service.c
+++ b/components/services/trilobite/libtrilobite/trilobite-service.c
@@ -457,11 +457,6 @@ trilobite_service_get_type (void)
 	return trilobite_service_type;
 }
 
-/*
-  FIXME bugzilla.eazel.com 854:
-  determine whether we want to set the name/version/whatnot in the _new(...) call
-  or using _set_name(...) calls.
- */
 TrilobiteService*
 trilobite_service_new() 
 {
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 24a42abcb..020313907 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -1084,7 +1084,8 @@ update_user_level_menu_items (NautilusWindow *window)
 						convert_user_level_to_menu_path (user_level),
 						TRUE);
 
-	/* FIXME: We want to hide the customize button for the novice user level.
+	/* FIXME bugzilla.eazel.com 1247: 
+	 * We want to hide the customize button for the novice user level.
 	 * It cant find a bonobo ui handler call to hide a menu item, so make it 
 	 * insensitive for now.
 	 */
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index d30006598..080f28c94 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -58,7 +58,8 @@
 #include <ctype.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
-/* FIXME: We should use inheritance instead of these special cases
+/* FIXME bugzilla.eazel.com 1243: 
+ * We should use inheritance instead of these special cases
  * for the desktop window.
  */
 #include "nautilus-desktop-window.h"
@@ -396,7 +397,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->statusbar_ctx = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar),
 							      "IhateGtkStatusbar");
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -405,15 +407,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up window contents and policy */	
 		gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
-		/* FIXME: Hard-wired size here? */
+		/* FIXME bugzilla.eazel.com 1244: Hard-wired size here? */
 		gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
 		window->content_hbox = gtk_hpaned_new ();
 
-		/* FIXME: No constant for the default? */
-		/* FIXME: Saved in pixels instead of in %? */
-		/* FIXME: No reality check on the value? */
-		/* FIXME: get_enum? why not get_integer? */
+		/* FIXME bugzilla.eazel.com 1245: No constant for the default? */
+		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.eazel.com 1245: get_enum? why not get_integer? */
 		sidebar_width = nautilus_preferences_get_enum (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, 148);
 		gtk_paned_set_position (GTK_PANED (window->content_hbox), sidebar_width);
 	}
@@ -431,7 +433,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
 			    nautilus_window_goto_uri_callback, window);
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (!NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -441,7 +444,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_widget_show_all (window->content_hbox);
 	
 	/* enable mouse tracking for the index panel */
-	/* FIXME: How about the sidebar doing this for itself. */
+	/* FIXME bugzilla.eazel.com 1246: How about the sidebar doing this for itself. */
 	gtk_widget_add_events (GTK_WIDGET (window->sidebar), GDK_POINTER_MOTION_MASK);
 
 	/* CORBA and Bonobo setup */
@@ -1218,7 +1221,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		
 		nautilus_view_frame_activate (new_view); 
 		
-		/* FIXME: We should use inheritance instead of these special cases
+		/* FIXME bugzilla.eazel.com 1243: 
+		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
 		if (!GTK_IS_PANED (window->content_hbox)) {
@@ -1231,7 +1235,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		}
 	}
 
-	/* FIXME: Why is this needed? We just removed and added a new
+	/* FIXME bugzilla.eazel.com 1242: 
+	 * Why is this needed? We just removed and added a new
 	 * view above? The content_hbox should be able to take care of
 	 * itself.
 	 */
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index d30006598..080f28c94 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -58,7 +58,8 @@
 #include <ctype.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
-/* FIXME: We should use inheritance instead of these special cases
+/* FIXME bugzilla.eazel.com 1243: 
+ * We should use inheritance instead of these special cases
  * for the desktop window.
  */
 #include "nautilus-desktop-window.h"
@@ -396,7 +397,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->statusbar_ctx = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar),
 							      "IhateGtkStatusbar");
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -405,15 +407,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up window contents and policy */	
 		gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
-		/* FIXME: Hard-wired size here? */
+		/* FIXME bugzilla.eazel.com 1244: Hard-wired size here? */
 		gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
 		window->content_hbox = gtk_hpaned_new ();
 
-		/* FIXME: No constant for the default? */
-		/* FIXME: Saved in pixels instead of in %? */
-		/* FIXME: No reality check on the value? */
-		/* FIXME: get_enum? why not get_integer? */
+		/* FIXME bugzilla.eazel.com 1245: No constant for the default? */
+		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.eazel.com 1245: get_enum? why not get_integer? */
 		sidebar_width = nautilus_preferences_get_enum (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, 148);
 		gtk_paned_set_position (GTK_PANED (window->content_hbox), sidebar_width);
 	}
@@ -431,7 +433,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
 			    nautilus_window_goto_uri_callback, window);
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (!NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -441,7 +444,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_widget_show_all (window->content_hbox);
 	
 	/* enable mouse tracking for the index panel */
-	/* FIXME: How about the sidebar doing this for itself. */
+	/* FIXME bugzilla.eazel.com 1246: How about the sidebar doing this for itself. */
 	gtk_widget_add_events (GTK_WIDGET (window->sidebar), GDK_POINTER_MOTION_MASK);
 
 	/* CORBA and Bonobo setup */
@@ -1218,7 +1221,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		
 		nautilus_view_frame_activate (new_view); 
 		
-		/* FIXME: We should use inheritance instead of these special cases
+		/* FIXME bugzilla.eazel.com 1243: 
+		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
 		if (!GTK_IS_PANED (window->content_hbox)) {
@@ -1231,7 +1235,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		}
 	}
 
-	/* FIXME: Why is this needed? We just removed and added a new
+	/* FIXME bugzilla.eazel.com 1242: 
+	 * Why is this needed? We just removed and added a new
 	 * view above? The content_hbox should be able to take care of
 	 * itself.
 	 */
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index d30006598..080f28c94 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -58,7 +58,8 @@
 #include <ctype.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
-/* FIXME: We should use inheritance instead of these special cases
+/* FIXME bugzilla.eazel.com 1243: 
+ * We should use inheritance instead of these special cases
  * for the desktop window.
  */
 #include "nautilus-desktop-window.h"
@@ -396,7 +397,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->statusbar_ctx = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar),
 							      "IhateGtkStatusbar");
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -405,15 +407,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up window contents and policy */	
 		gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
-		/* FIXME: Hard-wired size here? */
+		/* FIXME bugzilla.eazel.com 1244: Hard-wired size here? */
 		gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
 		window->content_hbox = gtk_hpaned_new ();
 
-		/* FIXME: No constant for the default? */
-		/* FIXME: Saved in pixels instead of in %? */
-		/* FIXME: No reality check on the value? */
-		/* FIXME: get_enum? why not get_integer? */
+		/* FIXME bugzilla.eazel.com 1245: No constant for the default? */
+		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.eazel.com 1245: get_enum? why not get_integer? */
 		sidebar_width = nautilus_preferences_get_enum (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, 148);
 		gtk_paned_set_position (GTK_PANED (window->content_hbox), sidebar_width);
 	}
@@ -431,7 +433,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
 			    nautilus_window_goto_uri_callback, window);
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (!NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -441,7 +444,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_widget_show_all (window->content_hbox);
 	
 	/* enable mouse tracking for the index panel */
-	/* FIXME: How about the sidebar doing this for itself. */
+	/* FIXME bugzilla.eazel.com 1246: How about the sidebar doing this for itself. */
 	gtk_widget_add_events (GTK_WIDGET (window->sidebar), GDK_POINTER_MOTION_MASK);
 
 	/* CORBA and Bonobo setup */
@@ -1218,7 +1221,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		
 		nautilus_view_frame_activate (new_view); 
 		
-		/* FIXME: We should use inheritance instead of these special cases
+		/* FIXME bugzilla.eazel.com 1243: 
+		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
 		if (!GTK_IS_PANED (window->content_hbox)) {
@@ -1231,7 +1235,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		}
 	}
 
-	/* FIXME: Why is this needed? We just removed and added a new
+	/* FIXME bugzilla.eazel.com 1242: 
+	 * Why is this needed? We just removed and added a new
 	 * view above? The content_hbox should be able to take care of
 	 * itself.
 	 */
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 24a42abcb..020313907 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -1084,7 +1084,8 @@ update_user_level_menu_items (NautilusWindow *window)
 						convert_user_level_to_menu_path (user_level),
 						TRUE);
 
-	/* FIXME: We want to hide the customize button for the novice user level.
+	/* FIXME bugzilla.eazel.com 1247: 
+	 * We want to hide the customize button for the novice user level.
 	 * It cant find a bonobo ui handler call to hide a menu item, so make it 
 	 * insensitive for now.
 	 */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index d30006598..080f28c94 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -58,7 +58,8 @@
 #include <ctype.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 
-/* FIXME: We should use inheritance instead of these special cases
+/* FIXME bugzilla.eazel.com 1243: 
+ * We should use inheritance instead of these special cases
  * for the desktop window.
  */
 #include "nautilus-desktop-window.h"
@@ -396,7 +397,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	window->statusbar_ctx = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar),
 							      "IhateGtkStatusbar");
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -405,15 +407,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		/* set up window contents and policy */	
 		gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
-		/* FIXME: Hard-wired size here? */
+		/* FIXME bugzilla.eazel.com 1244: Hard-wired size here? */
 		gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
 		window->content_hbox = gtk_hpaned_new ();
 
-		/* FIXME: No constant for the default? */
-		/* FIXME: Saved in pixels instead of in %? */
-		/* FIXME: No reality check on the value? */
-		/* FIXME: get_enum? why not get_integer? */
+		/* FIXME bugzilla.eazel.com 1245: No constant for the default? */
+		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.eazel.com 1245: get_enum? why not get_integer? */
 		sidebar_width = nautilus_preferences_get_enum (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, 148);
 		gtk_paned_set_position (GTK_PANED (window->content_hbox), sidebar_width);
 	}
@@ -431,7 +433,8 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_signal_connect (GTK_OBJECT (window->sidebar), "location_changed",
 			    nautilus_window_goto_uri_callback, window);
 	
-	/* FIXME: We should use inheritance instead of these special cases
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
         if (!NAUTILUS_IS_DESKTOP_WINDOW (window)) {
@@ -441,7 +444,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	gtk_widget_show_all (window->content_hbox);
 	
 	/* enable mouse tracking for the index panel */
-	/* FIXME: How about the sidebar doing this for itself. */
+	/* FIXME bugzilla.eazel.com 1246: How about the sidebar doing this for itself. */
 	gtk_widget_add_events (GTK_WIDGET (window->sidebar), GDK_POINTER_MOTION_MASK);
 
 	/* CORBA and Bonobo setup */
@@ -1218,7 +1221,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		
 		nautilus_view_frame_activate (new_view); 
 		
-		/* FIXME: We should use inheritance instead of these special cases
+		/* FIXME bugzilla.eazel.com 1243: 
+		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
 		if (!GTK_IS_PANED (window->content_hbox)) {
@@ -1231,7 +1235,8 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
 		}
 	}
 
-	/* FIXME: Why is this needed? We just removed and added a new
+	/* FIXME bugzilla.eazel.com 1242: 
+	 * Why is this needed? We just removed and added a new
 	 * view above? The content_hbox should be able to take care of
 	 * itself.
 	 */