Updated bugzilla.eazel.com references to refer to the

	corresponding bugzilla.gnome.org bug. Also updated my
	email address.

50 files changed, 155 insertions, 155 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 1be4875e6..528a0caa8 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -417,7 +417,7 @@ create_mount_link (FMDesktopIconView *icon_view,
 		return;
 	}
 	
-	/* FIXME bugzilla.eazel.com 5412: Design a comprehensive desktop mounting strategy */
+	/* FIXME bugzilla.gnome.org 45412: Design a comprehensive desktop mounting strategy */
 	if (!nautilus_volume_is_removable (volume)) {
 		return;
 	}
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 22d93b77c..f54646a53 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -22,7 +22,7 @@
  *
  * Authors: Ettore Perazzoli,
  *          John Sullivan <sullivan@eazel.com>,
- *          Darin Adler <darin@eazel.com>,
+ *          Darin Adler <darin@bentspoon.com>,
  *          Pavel Cisler <pavel@eazel.com>,
  *          David Emory Watson <dwatson@cs.ucr.edu>
  */
@@ -624,7 +624,7 @@ switch_location_and_view (NautilusViewIdentifier *identifier,
 	/* User has explicitly chosen a viewer other than the default, so
 	 * make it the default and then switch locations.
 	 */
-	/* FIXME bugzilla.eazel.com 1053: We might want an atomic operation
+	/* FIXME bugzilla.gnome.org 41053: We might want an atomic operation
 	 * for switching location and viewer together, so we don't have to
 	 * rely on metadata for holding the default location.
 	 */
@@ -829,7 +829,7 @@ duplicate_callback (BonoboUIComponent *component, gpointer callback_data, const
         view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 	if (selection_not_empty_in_menu_callback (view, selection)) {
-		/* FIXME bugzilla.eazel.com 5061:
+		/* FIXME bugzilla.gnome.org 45061:
 		 * should change things here so that we use a get_icon_locations (view, selection).
 		 * Not a problem in this case but in other places the selection may change by
 		 * the time we go and retrieve the icon positions, relying on the selection
@@ -1727,7 +1727,7 @@ zoomable_set_zoom_level_callback (BonoboZoomable *zoomable, float level, FMDirec
 static void
 zoomable_zoom_to_fit_callback (BonoboZoomable *zoomable, FMDirectoryView *view)
 {
-	/* FIXME bugzilla.eazel.com 2388:
+	/* FIXME bugzilla.gnome.org 42388:
 	 * Need to really implement "zoom to fit"
 	 */
 	fm_directory_view_restore_default_zoom_level (view);
@@ -4567,7 +4567,7 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 
 		action = ACTIVATION_ACTION_LAUNCH;
 		
-		/* FIXME bugzilla.eazel.com 2391: This should check if
+		/* FIXME bugzilla.gnome.org 42391: This should check if
 		 * the activation URI points to something launchable,
 		 * not the original file. Also, for symbolic links we
 		 * need to check the X bit on the target file, not on
@@ -4590,7 +4590,7 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 		if (action == ACTIVATION_ACTION_LAUNCH) {
 			quoted_path = eel_shell_quote (executable_path);
 			name = nautilus_file_get_name (file);
-			/* FIXME bugzilla.eazel.com 1773: This is a
+			/* FIXME bugzilla.gnome.org 41773: This is a
 			 * lame way to run command-line tools, since
 			 * there's no terminal for the output. But if
 			 * we always had a terminal, that would be
@@ -4782,7 +4782,7 @@ load_directory (FMDirectoryView *view,
 
 	view->details->reported_load_error = FALSE;
 
-	/* FIXME bugzilla.eazel.com 5062: In theory, we also need to monitor metadata here (as
+	/* FIXME bugzilla.gnome.org 45062: In theory, we also need to monitor metadata here (as
          * well as doing a call when ready), in case external forces
          * change the directory's file metadata.
 	 */
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 210af3775..992cff60f 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors: Ettore Perazzoli
- * 	    Darin Adler <darin@eazel.com>
+ * 	    Darin Adler <darin@bentspoon.com>
  * 	    John Sullivan <sullivan@eazel.com>
  *          Pavel Cisler <pavel@eazel.com>
  */
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index 34e349628..4868174fd 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -313,7 +313,7 @@ fm_rename_file (NautilusFile *file,
 	g_free (old_name);
 	eel_timed_wait_start (cancel_rename_callback, file,
 				   _("Cancel Rename?"), wait_message,
-				   NULL); /* FIXME bugzilla.eazel.com 2395: Parent this? */
+				   NULL); /* FIXME bugzilla.gnome.org 42395: Parent this? */
 	g_free (wait_message);
 
 	/* Start the rename. */
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index 680b043af..3652f21e0 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@@ -48,7 +48,7 @@ void fm_report_error_setting_group       (NautilusFile   *file,
 					  GnomeVFSResult  error_code,
 					  GtkWindow	 *parent_window);
 
-/* FIXME bugzilla.eazel.com 2394: Should this file be renamed or should these be moved? */
+/* FIXME bugzilla.gnome.org 42394: Should this file be renamed or should these be moved? */
 void fm_rename_file                      (NautilusFile   *file,
 					  const char     *new_name);
 
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 29c34e4c8..97ef9b550 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -951,7 +951,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
 	/* kill any sound preview process that is ongoing */
 	preview_audio (icon_view, NULL, FALSE);
 	
-	/* FIXME bugzilla.eazel.com 5060: Should use methods instead
+	/* FIXME bugzilla.gnome.org 45060: Should use methods instead
 	 * of hardcoding desktop knowledge in here.
 	 */
 	if (FM_IS_DESKTOP_ICON_VIEW (view)) {
@@ -1533,7 +1533,7 @@ band_select_ended_callback (NautilusIconContainer *container,
 /* handle the preview signal by inspecting the mime type.  For now, we only preview local sound files. */
 
 /* here's the timer task that actually plays the file using mpg123. */
-/* FIXME bugzilla.eazel.com 1258: we should get the application from our mime-type stuff */
+/* FIXME bugzilla.gnome.org 41258: we should get the application from our mime-type stuff */
 static int
 play_file (gpointer callback_data)
 {
@@ -1605,7 +1605,7 @@ play_file (gpointer callback_data)
 	return 0;
 }
 
-/* FIXME bugzilla.eazel.com 2530: Hardcoding this here sucks. We should be using components
+/* FIXME bugzilla.gnome.org 42530: Hardcoding this here sucks. We should be using components
  * for open ended things like this.
  */
 
@@ -1863,7 +1863,7 @@ icon_position_changed_callback (NautilusIconContainer *container,
 		g_free (position_string);
 	}
 
-	/* FIXME bugzilla.eazel.com 662: 
+	/* FIXME bugzilla.gnome.org 40662: 
 	 * %.2f is not a good format for the scale factor. We'd like it to
 	 * say "2" or "2x" instead of "2.00".
 	 */
@@ -1953,7 +1953,7 @@ get_icon_drop_target_uri_callback (NautilusIconContainer *container,
 
 	/* Check for Nautilus link */
 	if (nautilus_file_is_nautilus_link (file)) {
-		/* FIXME bugzilla.eazel.com 3020: This does sync. I/O and works only locally. */
+		/* FIXME bugzilla.gnome.org 43020: This does sync. I/O and works only locally. */
 		path = gnome_vfs_get_local_path_from_uri (uri);
 		if (path != NULL) {
 			target_uri = nautilus_link_local_get_link_uri (path);
@@ -2000,7 +2000,7 @@ get_icon_text_callback (NautilusIconContainer *container,
 	
 	/* Handle link files specially. */
 	if (nautilus_file_is_nautilus_link (file)) {
-		/* FIXME bugzilla.eazel.com 2531: Does sync. I/O and works only locally. */
+		/* FIXME bugzilla.gnome.org 42531: Does sync. I/O and works only locally. */
 		actual_uri = nautilus_file_get_uri (file);
 		path = gnome_vfs_get_local_path_from_uri (actual_uri);
 		g_free (actual_uri);
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 83a7c6d68..7fe654c9a 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -295,7 +295,7 @@ fm_list_view_initialize (gpointer object, gpointer klass)
 	 * to create_list) until later, when the function pointers
 	 * have been initialized by the subclass.
 	 */
-	/* FIXME bugzilla.eazel.com 2533: 
+	/* FIXME bugzilla.gnome.org 42533: 
 	 * This code currently relies on there being a call to
 	 * get_list before the widget is shown to the user. It would
 	 * be better to do something explicit, like connecting to
@@ -776,7 +776,7 @@ fm_list_get_default_action (EelList *list,
 
 	g_assert (EEL_IS_LIST (list));
 
-	/* FIXME bugzilla.eazel.com 2569: Too much code copied from nautilus-icon-dnd.c. Need to share more. */
+	/* FIXME bugzilla.gnome.org 42569: Too much code copied from nautilus-icon-dnd.c. Need to share more. */
 
 	switch (info) {
 	case EEL_ICON_DND_GNOME_ICON_LIST:
@@ -821,7 +821,7 @@ fm_list_handle_dropped_items (EelList *list,
 			      int x, int y, guint info,
 			      FMListView *list_view)
 {
-	/* FIXME bugzilla.eazel.com 1257:
+	/* FIXME bugzilla.gnome.org 41257:
 	 * Merge this with nautilus_icon_container_receive_dropped_icons
 	 */ 
 
@@ -992,7 +992,7 @@ create_list (FMListView *list_view)
 	int i;
 	FMListViewColumn column;
 
-	/* FIXME bugzilla.eazel.com 666:
+	/* FIXME bugzilla.gnome.org 40666:
 	 * title setup should allow for columns not being resizable at all,
 	 * justification, editable or not, type/format,
 	 * not being usable as a sort order criteria, etc.
@@ -1013,7 +1013,7 @@ create_list (FMListView *list_view)
 	for (i = 0; i < number_of_columns; ++i) {
 		get_column_specification (list_view, i, &column);
 
-		/* FIXME bugzilla.eazel.com 2532: Make a cover to do this trick. */
+		/* FIXME bugzilla.gnome.org 42532: Make a cover to do this trick. */
 		eel_clist_set_column_max_width (clist, i, column.maximum_width);
 		eel_clist_set_column_min_width (clist, i, column.minimum_width);
 		/* work around broken EelCList that pins the max_width to be no less than
@@ -1761,7 +1761,7 @@ fm_list_view_set_zoom_level (FMListView *list_view,
 	/* This little dance is necessary due to bugs in EelCList.
 	 * Must set min, then max, then min, then actual width.
 	 */
-	/* FIXME bugzilla.eazel.com 2532: Make a cover to do this
+	/* FIXME bugzilla.gnome.org 42532: Make a cover to do this
 	 * trick, or fix EelCList now that we have a copy of the
 	 * code here in Nautilus.
 	 */
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index cd4f8c477..f98d051b7 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -19,7 +19,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 
-   Authors: Darin Adler <darin@eazel.com>
+   Authors: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -716,7 +716,7 @@ activate_group_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 		 pair->file,
 		 _("Cancel Group Change?"),
 		 _("Changing group"),
-		 NULL); /* FIXME bugzilla.eazel.com 2397: Parent this? */
+		 NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
 	nautilus_file_set_group
 		(pair->file, pair->name,
 		 group_change_callback, NULL);
@@ -878,7 +878,7 @@ activate_owner_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 		 pair->file,
 		 _("Cancel Owner Change?"),
 		 _("Changing owner"),
-		 NULL); /* FIXME bugzilla.eazel.com 2397: Parent this? */
+		 NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
 	nautilus_file_set_owner
 		(pair->file, pair->name,
 		 owner_change_callback, NULL);
@@ -1364,7 +1364,7 @@ is_merged_trash_directory (NautilusFile *file)
 static gboolean
 should_show_custom_icon_buttons (FMPropertiesWindow *window) 
 {
-	/* FIXME bugzilla.eazel.com 5642:
+	/* FIXME bugzilla.gnome.org 45642:
 	 * Custom icons aren't displayed on the the desktop Trash icon, so
 	 * we shouldn't pretend that they work by showing them here.
 	 * When bug 5642 is fixed we can remove this case.
@@ -1404,7 +1404,7 @@ should_show_accessed_date (FMPropertiesWindow *window)
 static gboolean
 should_show_mime_type (FMPropertiesWindow *window) 
 {
-	/* FIXME bugzilla.eazel.com 5652:
+	/* FIXME bugzilla.gnome.org 45652:
 	 * nautilus_file_is_directory should return TRUE for special
 	 * trash directory, but doesn't. I could trivially fix this
 	 * with a check for is_merged_trash_directory here instead.
@@ -1484,7 +1484,7 @@ create_basic_page (FMPropertiesWindow *window)
 	/* Update name field initially before hooking up changed signal. */
 	name_field_update_to_match_file (NAUTILUS_ENTRY (name_field));
 
-/* FIXME bugzilla.eazel.com 2151:
+/* FIXME bugzilla.gnome.org 42151:
  * With this (and one place elsewhere in this file, not sure which is the
  * trouble-causer) code in place, bug 2151 happens (crash on quit). Since
  * we've removed Undo from Nautilus for now, I'm just ifdeffing out this
@@ -2061,7 +2061,7 @@ create_permissions_page (FMPropertiesWindow *window)
 static gboolean
 should_show_emblems (FMPropertiesWindow *window) 
 {
-	/* FIXME bugzilla.eazel.com 5643:
+	/* FIXME bugzilla.gnome.org 45643:
 	 * Emblems aren't displayed on the the desktop Trash icon, so
 	 * we shouldn't pretend that they work by showing them here.
 	 * When bug 5643 is fixed we can remove this case.
@@ -2231,7 +2231,7 @@ create_properties_window_callback (NautilusFile *file, gpointer callback_data)
 
 	remove_pending_file (startup_data, FALSE, TRUE, TRUE);
 
-/* FIXME bugzilla.eazel.com 2151:
+/* FIXME bugzilla.gnome.org 42151:
  * See comment elsewhere in this file about bug 2151.
  */
 #ifdef UNDO_ENABLED
diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h
index 6f2fb9cf4..fc47547f2 100644
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.h
@@ -20,7 +20,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 
-   Authors: Darin Adler <darin@eazel.com>
+   Authors: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef FM_PROPERTIES_WINDOW_H
diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c
index 391b6955a..211f11d31 100644
--- a/src/file-manager/fm-search-list-view.c
+++ b/src/file-manager/fm-search-list-view.c
@@ -51,7 +51,7 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 
-/* FIXME bugzilla.eazel.com 2815: This code uses part of the
+/* FIXME bugzilla.gnome.org 42815: This code uses part of the
  * NautilusSearchBarCriterion class, which is really for complex
  * search bar user interface. We only need to do some non-UI
  * manipulations of the search URI, so we can refactor the code, put
@@ -170,7 +170,7 @@ load_location_callback (NautilusView *nautilus_view, char *location)
 
 }
 
-/* FIXME bugzilla.eazel.com 5057: GnomeVFSResults may not be the
+/* FIXME bugzilla.gnome.org 45057: GnomeVFSResults may not be the
    best way to communicate an error code to
    a view */
 static void
@@ -621,7 +621,7 @@ real_adding_file (FMListView *view, NautilusFile *file)
 
 	EEL_CALL_PARENT (FM_LIST_VIEW_CLASS, adding_file, (view, file));
 
-	/* FIXME bugzilla.eazel.com 5059: this implies that positioning, custom icon, icon
+	/* FIXME bugzilla.gnome.org 45059: this implies that positioning, custom icon, icon
 	 * stretching, etc, will be based on the real directory the file is in,
 	 * and won't be specific to the search directory. Is that OK? 
 	 */
diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c
index 4832255aa..5e397e3b5 100644
--- a/src/nautilus-applicable-views.c
+++ b/src/nautilus-applicable-views.c
@@ -22,7 +22,7 @@
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
  *           Maciej Stachowiak <mjs@eazel.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
diff --git a/src/nautilus-applicable-views.h b/src/nautilus-applicable-views.h
index 46d53d57f..40dddb5ae 100644
--- a/src/nautilus-applicable-views.h
+++ b/src/nautilus-applicable-views.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *           Maciej Stachowiak <mjs@eazel.com>
  *
  */
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 45f3072c9..eb04486e4 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>,
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
@@ -535,7 +535,7 @@ nautilus_application_startup (NautilusApplication *application,
 				    " from the console may fix the problem. If not,"
 				    " you can try rebooting the computer or"
 				    " installing Nautilus again.");
-			/* FIXME bugzilla.eazel.com 2536: The guesses and stuff here are lame. */
+			/* FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame. */
 			detailed_message = _("Nautilus can't be used now. "
 					     "Running the command \"nautilus-clean.sh -x\""
 					     " from the console may fix the problem. If not,"
@@ -562,7 +562,7 @@ nautilus_application_startup (NautilusApplication *application,
 			 * version of OAF). Show dialog and terminate the
 			 * program.
 			 */
-			/* FIXME bugzilla.eazel.com 2537: Looks like this does happen with the
+			/* FIXME bugzilla.gnome.org 42537: Looks like this does happen with the
 			 * current OAF. I guess I read the code
 			 * wrong. Need to figure out when and make a
 			 * good message.
@@ -584,7 +584,7 @@ nautilus_application_startup (NautilusApplication *application,
 			 * we better stop looping.
 			 */
 			if (result == OAF_REG_SUCCESS) {
-				/* FIXME bugzilla.eazel.com 2538: When can this happen? */
+				/* FIXME bugzilla.gnome.org 42538: When can this happen? */
 				message = _("Nautilus can't be used now, due to an unexpected error.");
 				detailed_message = _("Nautilus can't be used now, due to an unexpected error "
 						     "from OAF when attempting to locate the factory."
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 9b6fc1496..235d07b43 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -452,7 +452,7 @@ on_select_row (GtkCList	       *clist,
 	g_assert (GTK_IS_ENTRY (name_field));
 	g_assert (GTK_IS_ENTRY (uri_field));
 
-	/* Workaround for apparent GtkCList bug. See bugzilla.eazel.com 7846. */
+	/* Workaround for apparent GtkCList bug. See bugzilla.gnome.org 47846. */
 	if (clist->rows <= row) {
 		return;
 	}
diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c
index 229319681..7b672718b 100644
--- a/src/nautilus-complex-search-bar.c
+++ b/src/nautilus-complex-search-bar.c
@@ -370,7 +370,7 @@ nautilus_complex_search_bar_set_location (NautilusNavigationBar *navigation_bar,
 
 	bar = NAUTILUS_COMPLEX_SEARCH_BAR (navigation_bar);
 
-	/* FIXME bugzilla.eazel.com 2517: Not implemented. */
+	/* FIXME bugzilla.gnome.org 42517: Not implemented. */
 }
 
 void  
@@ -379,7 +379,7 @@ nautilus_complex_search_bar_queue_resize (NautilusComplexSearchBar      *bar)
 	GtkWidget *dock;
 
 	gtk_widget_queue_resize (bar->details->criteria_container);
-	/* FIXME bugzilla.eazel.com 3171:
+	/* FIXME bugzilla.gnome.org 43171:
 	 * (It is possible this comment is no longer correct due to
 	 * a change in the layout code)
 	 * We don't know why this line is needed here, but if it's removed
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index c437e823d..85b9d7acd 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Authors: Darin Adler <darin@eazel.com>
+ * Authors: Darin Adler <darin@bentspoon.com>
  */
 
 /* nautilus-desktop-window.c
@@ -72,7 +72,7 @@ nautilus_desktop_window_initialize (NautilusDesktopWindow *window)
 {
 	window->details = g_new0 (NautilusDesktopWindowDetails, 1);
 
-	/* FIXME bugzilla.eazel.com 1251: 
+	/* FIXME bugzilla.gnome.org 41251: 
 	 * Although Havoc had this call to set_default_size in
 	 * his code, it seems to have no effect for me. But the
 	 * set_usize below does seem to work.
@@ -324,7 +324,7 @@ realize (GtkWidget *widget)
 				   | WIN_HINTS_SKIP_TASKBAR
 				   | WIN_HINTS_SKIP_FOCUS);
 
-	/* FIXME bugzilla.eazel.com 1255: 
+	/* FIXME bugzilla.gnome.org 41255: 
 	 * Should we do a gdk_window_move_resize here, in addition to
 	 * the calls in initialize above that set the size?
 	 */
diff --git a/src/nautilus-desktop-window.h b/src/nautilus-desktop-window.h
index 2f4b15667..4244dc47e 100644
--- a/src/nautilus-desktop-window.h
+++ b/src/nautilus-desktop-window.h
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Authors: Darin Adler <darin@eazel.com>
+ * Authors: Darin Adler <darin@bentspoon.com>
  */
 
 /* nautilus-desktop-window.h
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index b56742e3c..cf12d9bd2 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -155,7 +155,7 @@ druid_cancel (GtkWidget *druid)
 {
 	gtk_widget_destroy (gtk_widget_get_toplevel (druid));
 
-	/* FIXME bugzilla.eazel.com 5050: Why _exit instead of a plain exit? It might be OK
+	/* FIXME bugzilla.gnome.org 45050: Why _exit instead of a plain exit? It might be OK
 	 * to do nothing here now that Nautilus knows to quit when
 	 * windows go away.
 	 */
@@ -207,7 +207,7 @@ druid_finished (GtkWidget *druid_page)
 	 * we don't want Nautilus to hang indefinitely trying to resolve
 	 * an HTTP address.
 	 */
-	/* FIXME bugzilla.eazel.com 5051: Perhaps we can fix the underlying problem instead of
+	/* FIXME bugzilla.gnome.org 45051: Perhaps we can fix the underlying problem instead of
 	 * having this hack here to guess whether the network is broken.
 	 */
 	if (Untested == network_status) {
@@ -740,7 +740,7 @@ next_update_page_callback (GtkWidget *button, GnomeDruid *druid)
 {
 	if (last_update_choice == 0) {
 		/* initiate the file transfer and launch a timer task to track feedback */
-		/* FIXME bugzilla.eazel.com 5053: There's no timer task! */
+		/* FIXME bugzilla.gnome.org 45053: There's no timer task! */
 		initiate_file_download (druid);
 		
 		/* return FALSE to display the feedback page */
@@ -890,7 +890,7 @@ set_up_gmc_transition_page (NautilusDruidPageEazel *page)
 	gtk_signal_connect (GTK_OBJECT (checkbox), "toggled", GTK_SIGNAL_FUNC (transition_value_changed), &transfer_gmc_icons);
 
 #if 0
-	/* This option is currently disabled, per bugzilla.eazel.com 7557 */
+	/* This option is currently disabled, per bugzilla.gnome.org 47557 */
 
 	checkbox = gtk_check_button_new_with_label (_("Launch Nautilus when GNOME starts up."));
 	gtk_box_pack_start (GTK_BOX (main_box), checkbox, FALSE, FALSE, 0);
@@ -1255,7 +1255,7 @@ initiate_file_download (GnomeDruid *druid)
 	/* Cancel any download already in progress. */
 	gtk_object_remove_data (GTK_OBJECT (druid), READ_FILE_HANDLE_TAG);
 			
-	/* FIXME bugzilla.eazel.com 5054: We might hang here for a while; if we do, we don't want
+	/* FIXME bugzilla.gnome.org 45054: We might hang here for a while; if we do, we don't want
 	 * the user to get forced through the druid again
 	 */
 	nautilus_set_first_time_file_flag ();
@@ -1360,7 +1360,7 @@ set_http_proxy (const char *proxy_url)
  * reads newline (or CR) or EOF terminated line from stream, allocating the return
  * buffer as appropriate
  **/
-/* FIXME bugzilla.eazel.com 5055: Belongs in a library, not here. */
+/* FIXME bugzilla.gnome.org 45055: Belongs in a library, not here. */
 static char * 
 getline_dup (FILE* stream)
 {
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 6b57044e0..2b1540890 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -127,7 +127,7 @@ static void     background_metadata_changed_callback   (NautilusSidebar  *sideba
 
 #define DEFAULT_TAB_COLOR "rgb:9999/9999/9999"
 
-/* FIXME bugzilla.eazel.com 1245: hardwired sizes */
+/* FIXME bugzilla.gnome.org 41245: hardwired sizes */
 #define SIDEBAR_MINIMUM_WIDTH 1
 #define SIDEBAR_MINIMUM_HEIGHT 400
 
@@ -702,7 +702,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 	switch (hit_test (sidebar, x, y)) {
 	case NO_PART:
 	case BACKGROUND_PART:
-		/* FIXME bugzilla.eazel.com 2507: Does this work for all images, or only background images?
+		/* FIXME bugzilla.gnome.org 42507: Does this work for all images, or only background images?
 		 * Other views handle background images differently from other URIs.
 		 */
 		if (exactly_one && uri_is_local_image (uris[0])) {
@@ -1356,7 +1356,7 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list)
 				    FALSE, FALSE, 
 				    0);
 
-		/* FIXME bugzilla.eazel.com 2510: Security hole?
+		/* FIXME bugzilla.gnome.org 42510: Security hole?
 		 * Unsafe to use a string from the MIME file as a
 		 * printf format string without first checking it over
 		 * somehow. We can do a search and replace on the "%s"
diff --git a/src/nautilus-link-set-window.c b/src/nautilus-link-set-window.c
index b75337130..898d30962 100644
--- a/src/nautilus-link-set-window.c
+++ b/src/nautilus-link-set-window.c
@@ -151,7 +151,7 @@ get_link_set_names (void)
 
 	link_set_list = NULL;
 	
-	/* FIXME bugzilla.eazel.com 5049: The names should really come from the names inside the files. */
+	/* FIXME bugzilla.gnome.org 45049: The names should really come from the names inside the files. */
 	/* build the list by iterating through the directory info */	
 	for (node = list; node != NULL; node = node->next) {
 		current_file_info = node->data;
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a54ac302c..d3e5a0434 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * Authors: Elliot Lee <sopwith@redhat.com>,
- *          Darin Adler <darin@eazel.com>,
+ *          Darin Adler <darin@bentspoon.com>,
  *          John Sullivan <sullivan@eazel.com>
  *
  */
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 1eb756080..2364df438 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -80,7 +80,7 @@
 #include <math.h>
 #include <sys/time.h>
 
-/* FIXME bugzilla.eazel.com 1243: 
+/* FIXME bugzilla.gnome.org 41243: 
  * We should use inheritance instead of these special cases
  * for the desktop window.
  */
@@ -349,7 +349,7 @@ nautilus_window_clear_status (gpointer callback_data)
 
 	nautilus_window_ui_freeze (window);
 
-	/* FIXME bugzilla.eazel.com 3597:
+	/* FIXME bugzilla.gnome.org 43597:
 	 * Should pass "" or NULL here. This didn't work, then did, now doesn't again.
 	 * When this is fixed in Bonobo we should change this line.
 	 */
@@ -728,7 +728,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	gtk_widget_show (location_bar_box);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -740,15 +740,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		window->content_hbox = nautilus_horizontal_splitter_new ();
 		panel = E_PANED (window->content_hbox);
 		
-		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
-		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.gnome.org 41245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.gnome.org 41245: No reality check on the value? */
 		sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH);
 		e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
 	}
 	gtk_widget_show (window->content_hbox);
 	bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -769,7 +769,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	bonobo_ui_component_freeze (window->details->shell_ui, NULL);
 
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -783,7 +783,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		nautilus_bonobo_set_hidden (window->details->shell_ui,
 					    MENU_BAR_PATH, TRUE);
 
-		/* FIXME bugzilla.eazel.com 4752:
+		/* FIXME bugzilla.gnome.org 44752:
 		 * If we ever get the unsigned math errors in
 		 * gtk_menu_item_size_allocate fixed this can be removed.
 		 */
@@ -1411,7 +1411,7 @@ chose_component_callback (NautilusViewIdentifier *identifier, gpointer callback_
 		nautilus_window_set_content_view (window, identifier);
 	}
 	
-	/* FIXME bugzilla.eazel.com 1334: There should be some global
+	/* FIXME bugzilla.gnome.org 41334: There should be some global
 	 * way to signal that the file type associations have changed,
 	 * so that the places that display these lists can react. For
 	 * now, hardwire this case, which is the most obvious one by
@@ -1982,7 +1982,7 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 		 */
 		nautilus_window_ui_update (window);
 
-		/* FIXME bugzilla.eazel.com 1243: 
+		/* FIXME bugzilla.gnome.org 41243: 
 		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index d0c43122f..0e764d3e3 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 /* nautilus-window.h: Interface of the main window object */
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 1eb756080..2364df438 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -80,7 +80,7 @@
 #include <math.h>
 #include <sys/time.h>
 
-/* FIXME bugzilla.eazel.com 1243: 
+/* FIXME bugzilla.gnome.org 41243: 
  * We should use inheritance instead of these special cases
  * for the desktop window.
  */
@@ -349,7 +349,7 @@ nautilus_window_clear_status (gpointer callback_data)
 
 	nautilus_window_ui_freeze (window);
 
-	/* FIXME bugzilla.eazel.com 3597:
+	/* FIXME bugzilla.gnome.org 43597:
 	 * Should pass "" or NULL here. This didn't work, then did, now doesn't again.
 	 * When this is fixed in Bonobo we should change this line.
 	 */
@@ -728,7 +728,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	gtk_widget_show (location_bar_box);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -740,15 +740,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		window->content_hbox = nautilus_horizontal_splitter_new ();
 		panel = E_PANED (window->content_hbox);
 		
-		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
-		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.gnome.org 41245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.gnome.org 41245: No reality check on the value? */
 		sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH);
 		e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
 	}
 	gtk_widget_show (window->content_hbox);
 	bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -769,7 +769,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	bonobo_ui_component_freeze (window->details->shell_ui, NULL);
 
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -783,7 +783,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		nautilus_bonobo_set_hidden (window->details->shell_ui,
 					    MENU_BAR_PATH, TRUE);
 
-		/* FIXME bugzilla.eazel.com 4752:
+		/* FIXME bugzilla.gnome.org 44752:
 		 * If we ever get the unsigned math errors in
 		 * gtk_menu_item_size_allocate fixed this can be removed.
 		 */
@@ -1411,7 +1411,7 @@ chose_component_callback (NautilusViewIdentifier *identifier, gpointer callback_
 		nautilus_window_set_content_view (window, identifier);
 	}
 	
-	/* FIXME bugzilla.eazel.com 1334: There should be some global
+	/* FIXME bugzilla.gnome.org 41334: There should be some global
 	 * way to signal that the file type associations have changed,
 	 * so that the places that display these lists can react. For
 	 * now, hardwire this case, which is the most obvious one by
@@ -1982,7 +1982,7 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 		 */
 		nautilus_window_ui_update (window);
 
-		/* FIXME bugzilla.eazel.com 1243: 
+		/* FIXME bugzilla.gnome.org 41243: 
 		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h
index d0c43122f..0e764d3e3 100644
--- a/src/nautilus-object-window.h
+++ b/src/nautilus-object-window.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 /* nautilus-window.h: Interface of the main window object */
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index 64ccb153c..4d9572353 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -364,7 +364,7 @@ static EelPreferencesItemDescription tradeoffs_items[] = {
 	  EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO
 	},
 
-	/* FIXME bugzilla.eazel.com 2560: This title phrase needs improvement. */
+	/* FIXME bugzilla.gnome.org 42560: This title phrase needs improvement. */
 	{ N_("Make Folder Appearance Details Public"),
 	  NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA,
 	  NULL,
diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c
index 975065291..647920c94 100644
--- a/src/nautilus-search-bar-criterion.c
+++ b/src/nautilus-search-bar-criterion.c
@@ -237,7 +237,7 @@ nautilus_search_bar_criterion_destroy (GtkObject *object)
 	g_return_if_fail (NAUTILUS_IS_SEARCH_BAR_CRITERION (object));
 	criterion = NAUTILUS_SEARCH_BAR_CRITERION (object);
 
-	/* FIXME bugzilla.eazel.com 2437: need more freeage */
+	/* FIXME bugzilla.gnome.org 42437: need more freeage */
 	gtk_signal_disconnect_by_data (nautilus_signaller_get_current (),
 				       criterion);
 	/*	nautilus_undo_editable_set_undo_key (GTK_EDITABLE (criterion->details->value_entry), FALSE);
diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
index a6d8f053c..1e5653bcb 100644
--- a/src/nautilus-search-bar.c
+++ b/src/nautilus-search-bar.c
@@ -32,7 +32,7 @@
 
 #include <eel/eel-gtk-macros.h>
 
-/* FIXME bugzilla.eazel.com 2516: This adds nothing to NautilusNavigationBar.
+/* FIXME bugzilla.gnome.org 42516: This adds nothing to NautilusNavigationBar.
  * Perhaps we can remove it.
  */
 
diff --git a/src/nautilus-self-check-functions.c b/src/nautilus-self-check-functions.c
index 93c52ad44..59c47dc10 100644
--- a/src/nautilus-self-check-functions.c
+++ b/src/nautilus-self-check-functions.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Author: Darin Adler <darin@eazel.com>
+ * Author: Darin Adler <darin@bentspoon.com>
  */
    
 /* nautilus-self-check-functions.c: Wrapper for all self check functions
diff --git a/src/nautilus-self-check-functions.h b/src/nautilus-self-check-functions.h
index e16fa78e7..fbefe7673 100644
--- a/src/nautilus-self-check-functions.h
+++ b/src/nautilus-self-check-functions.h
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Author: Darin Adler <darin@eazel.com>
+ * Author: Darin Adler <darin@bentspoon.com>
  */
 
 /* nautilus-self-check-functions.h: Wrapper and prototypes for all self
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index da2813efd..528ab9d5f 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -85,7 +85,7 @@
 
 	<submenu name="Edit" _label="_Edit">
 
-<!-- FIXME bugzilla.eazel.com 3515
+<!-- FIXME bugzilla.gnome.org 43515
 
      Undo is disabled until we have a better implementation.
      Both here and in nautilus-undo-signal-handlers.c.
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index 102a5eae6..6bc1cffc5 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -254,7 +254,7 @@ display_caveat_first_time (NautilusShell *shell, NautilusWindow *window)
 	/* Show the "not ready for prime time" dialog after the first
 	 * window appears, so it's on top.
 	 */
-	/* FIXME bugzilla.eazel.com 1256: It's not on top of the
+	/* FIXME bugzilla.gnome.org 41256: It's not on top of the
          * windows other than the first one.
 	 */
 	if (!showed_caveat
diff --git a/src/nautilus-sidebar-tabs.c b/src/nautilus-sidebar-tabs.c
index 17f34b9c8..21cd21599 100644
--- a/src/nautilus-sidebar-tabs.c
+++ b/src/nautilus-sidebar-tabs.c
@@ -624,7 +624,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
 		tab_rect->height = sidebar_tabs->details->tab_height;
 	}
 	
-	/* FIXME bugzilla.eazel.com 668: 
+	/* FIXME bugzilla.gnome.org 40668: 
 	 * we must "ellipsize" the name if it doesn't fit, for now, assume it does 
 	 */
 	 
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 1991105f3..3f2b59e38 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -312,7 +312,7 @@ nautilus_sidebar_title_background (NautilusSidebarTitle *sidebar_title)
 		g_return_val_if_fail (EEL_IS_BACKGROUND (background), NULL);
 		return background;
 	} else {
-		/* FIXME bugzilla.eazel.com 5042
+		/* FIXME bugzilla.gnome.org 45042
 		 * It would be preferable to assert widget != NULL and not have
 		 * this else case. Doing this would require us to be carful when
 		 * nautilus_sidebar_title_select_text_color is called - which would
@@ -370,7 +370,7 @@ nautilus_sidebar_title_select_text_color (NautilusSidebarTitle *sidebar_title)
 		}
 		
 		if (sidebar_title_color == NULL) {
-			/* FIXME bugzilla.eazel.com 2496: for now, both the title and info colors are the same */
+			/* FIXME bugzilla.gnome.org 42496: for now, both the title and info colors are the same */
 			if (eel_background_is_dark (background)) {
 				sidebar_title_color = g_strdup("rgb:FFFF/FFFF/FFFF");
 				sidebar_info_title_color = g_strdup("rgb:FFFF/FFFF/FFFF");
@@ -585,7 +585,7 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
 static void
 update_title (NautilusSidebarTitle *sidebar_title)
 {
-	/* FIXME bugzilla.eazel.com 2500: We could defer showing the title until the icon is ready. */
+	/* FIXME bugzilla.gnome.org 42500: We could defer showing the title until the icon is ready. */
 	if (eel_label_set_text (EEL_LABEL (sidebar_title->details->title_label),
 				     sidebar_title->details->title_text)) {
 		update_title_font (sidebar_title);
@@ -649,7 +649,7 @@ update_more_info (NautilusSidebarTitle *sidebar_title)
 		info_string = g_string_new (component_info);
 		g_free (component_info);
 	} else {
-		/* FIXME bugzilla.eazel.com 2500: We could defer showing info until the icon is ready. */
+		/* FIXME bugzilla.gnome.org 42500: We could defer showing info until the icon is ready. */
 		/* Adding this special case for search results to 
 		   correspond to the fix for bug 2341.  */
 		if (file != NULL && file_is_search_location (file)) {
@@ -706,7 +706,7 @@ update_emblems (NautilusSidebarTitle *sidebar_title)
 	GList *icons, *p;
 	GdkPixbuf *pixbuf;
 
-	/* FIXME bugzilla.eazel.com 2500: We could defer showing emblems until the icon is ready. */
+	/* FIXME bugzilla.gnome.org 42500: We could defer showing emblems until the icon is ready. */
 	/* exit if we don't have the file yet */
 	if (sidebar_title->details->file == NULL) {
 		return;
@@ -741,7 +741,7 @@ update_notes (NautilusSidebarTitle *sidebar_title)
 {
 	char *text;
 	
-	/* FIXME bugzilla.eazel.com 2500: We could defer showing notes until the icon is ready. */
+	/* FIXME bugzilla.gnome.org 42500: We could defer showing notes until the icon is ready. */
 
 	text = nautilus_file_get_metadata (sidebar_title->details->file,
 					   NAUTILUS_METADATA_KEY_NOTES,
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 6b57044e0..2b1540890 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -127,7 +127,7 @@ static void     background_metadata_changed_callback   (NautilusSidebar  *sideba
 
 #define DEFAULT_TAB_COLOR "rgb:9999/9999/9999"
 
-/* FIXME bugzilla.eazel.com 1245: hardwired sizes */
+/* FIXME bugzilla.gnome.org 41245: hardwired sizes */
 #define SIDEBAR_MINIMUM_WIDTH 1
 #define SIDEBAR_MINIMUM_HEIGHT 400
 
@@ -702,7 +702,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar,
 	switch (hit_test (sidebar, x, y)) {
 	case NO_PART:
 	case BACKGROUND_PART:
-		/* FIXME bugzilla.eazel.com 2507: Does this work for all images, or only background images?
+		/* FIXME bugzilla.gnome.org 42507: Does this work for all images, or only background images?
 		 * Other views handle background images differently from other URIs.
 		 */
 		if (exactly_one && uri_is_local_image (uris[0])) {
@@ -1356,7 +1356,7 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list)
 				    FALSE, FALSE, 
 				    0);
 
-		/* FIXME bugzilla.eazel.com 2510: Security hole?
+		/* FIXME bugzilla.gnome.org 42510: Security hole?
 		 * Unsafe to use a string from the MIME file as a
 		 * printf format string without first checking it over
 		 * somehow. We can do a search and replace on the "%s"
diff --git a/src/nautilus-simple-search-bar.c b/src/nautilus-simple-search-bar.c
index 2c6ac99ef..c3308dab8 100644
--- a/src/nautilus-simple-search-bar.c
+++ b/src/nautilus-simple-search-bar.c
@@ -202,7 +202,7 @@ nautilus_simple_search_bar_get_location (NautilusNavigationBar *navigation_bar)
 char *
 nautilus_search_uri_to_simple_search_criteria (const char *uri)
 {
-	/* FIXME bugzilla.eazel.com 2511: Not yet implemented. */
+	/* FIXME bugzilla.gnome.org 42511: Not yet implemented. */
 	return g_strdup ("");
 }
 
@@ -215,7 +215,7 @@ nautilus_simple_search_criteria_to_search_uri (const char *search_criteria)
 	char *escaped_fragment;
 	int length, i; 
 
-	/* FIXME bugzilla.eazel.com 2512: 
+	/* FIXME bugzilla.gnome.org 42512: 
 	 * The logic here should be exactly the same as the logic for
 	 * a complex search-by-file-name. Currently the complex search doesn't
 	 * do the multi-word handling that this function does. They should use
@@ -224,14 +224,14 @@ nautilus_simple_search_criteria_to_search_uri (const char *search_criteria)
 	g_return_val_if_fail (search_criteria != NULL, NULL);
 
 	words = g_strsplit (search_criteria, " ", strlen (search_criteria));
-	/* FIXME bugzilla.eazel.com 2513: this should eventually be: length = strlen ("[file%3A%2F%2F%2F]"); */
+	/* FIXME bugzilla.gnome.org 42513: this should eventually be: length = strlen ("[file%3A%2F%2F%2F]"); */
 	length = strlen ("[file:///]");
 	/* Count total length */
 	for (i = 0; words[i] != NULL; i++) {
 		length += strlen (NAUTILUS_SEARCH_URI_TEXT_NAME) + strlen (" contains ") + strlen (words[i]) + strlen (" & ");
 	}
 	fragment = g_new0 (char, length + 1);
-	/* FIXME bugzilla.eazel.com 2513: this should eventually be: sprintf (fragment, "[file%%3A%%2F%%2F%%2F]"); */
+	/* FIXME bugzilla.gnome.org 42513: this should eventually be: sprintf (fragment, "[file%%3A%%2F%%2F%%2F]"); */
 	sprintf (fragment, "[file:///]");
 	if (words[0] != NULL) {
 		for (i = 0; words[i+1] != NULL; i++) {
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 1eb756080..2364df438 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -80,7 +80,7 @@
 #include <math.h>
 #include <sys/time.h>
 
-/* FIXME bugzilla.eazel.com 1243: 
+/* FIXME bugzilla.gnome.org 41243: 
  * We should use inheritance instead of these special cases
  * for the desktop window.
  */
@@ -349,7 +349,7 @@ nautilus_window_clear_status (gpointer callback_data)
 
 	nautilus_window_ui_freeze (window);
 
-	/* FIXME bugzilla.eazel.com 3597:
+	/* FIXME bugzilla.gnome.org 43597:
 	 * Should pass "" or NULL here. This didn't work, then did, now doesn't again.
 	 * When this is fixed in Bonobo we should change this line.
 	 */
@@ -728,7 +728,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	gtk_widget_show (location_bar_box);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -740,15 +740,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		window->content_hbox = nautilus_horizontal_splitter_new ();
 		panel = E_PANED (window->content_hbox);
 		
-		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
-		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.gnome.org 41245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.gnome.org 41245: No reality check on the value? */
 		sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH);
 		e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
 	}
 	gtk_widget_show (window->content_hbox);
 	bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -769,7 +769,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	bonobo_ui_component_freeze (window->details->shell_ui, NULL);
 
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -783,7 +783,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		nautilus_bonobo_set_hidden (window->details->shell_ui,
 					    MENU_BAR_PATH, TRUE);
 
-		/* FIXME bugzilla.eazel.com 4752:
+		/* FIXME bugzilla.gnome.org 44752:
 		 * If we ever get the unsigned math errors in
 		 * gtk_menu_item_size_allocate fixed this can be removed.
 		 */
@@ -1411,7 +1411,7 @@ chose_component_callback (NautilusViewIdentifier *identifier, gpointer callback_
 		nautilus_window_set_content_view (window, identifier);
 	}
 	
-	/* FIXME bugzilla.eazel.com 1334: There should be some global
+	/* FIXME bugzilla.gnome.org 41334: There should be some global
 	 * way to signal that the file type associations have changed,
 	 * so that the places that display these lists can react. For
 	 * now, hardwire this case, which is the most obvious one by
@@ -1982,7 +1982,7 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 		 */
 		nautilus_window_ui_update (window);
 
-		/* FIXME bugzilla.eazel.com 1243: 
+		/* FIXME bugzilla.gnome.org 41243: 
 		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h
index d0c43122f..0e764d3e3 100644
--- a/src/nautilus-spatial-window.h
+++ b/src/nautilus-spatial-window.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 /* nautilus-window.h: Interface of the main window object */
diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c
index f4321dd20..8ca4d8578 100644
--- a/src/nautilus-switchable-navigation-bar.c
+++ b/src/nautilus-switchable-navigation-bar.c
@@ -206,7 +206,7 @@ nautilus_switchable_navigation_bar_set_mode (NautilusSwitchableNavigationBar
 
 	nautilus_switchable_navigation_bar_activate (bar);
 
-	/* FIXME bugzilla.eazel.com 3171:
+	/* FIXME bugzilla.gnome.org 43171:
 	 * We don't know why this line is needed here, but if it's removed
 	 * then the bar won't shrink when we switch from the complex search
 	 * bar to the location bar (though it does grow when switching in
diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c
index 981362e18..bcd14bcd3 100644
--- a/src/nautilus-switchable-search-bar.c
+++ b/src/nautilus-switchable-search-bar.c
@@ -77,7 +77,7 @@ search_bar_preference_changed_callback (gpointer user_data)
 	g_assert (NAUTILUS_IS_SWITCHABLE_SEARCH_BAR (user_data));
 
 	/* Switch immediately as long as the current search_uri doesn't veto the switch.
-	 * FIXME bugzilla.eazel.com 2515: 
+	 * FIXME bugzilla.gnome.org 42515: 
 	 * Perhaps switch immediately anyway and blow away partially-formed
 	 * search criteria?
 	 */
@@ -223,7 +223,7 @@ nautilus_switchable_search_bar_set_mode (NautilusSwitchableSearchBar *bar,
 		break;
 	}
 
-	/* FIXME bugzilla.eazel.com 3171:
+	/* FIXME bugzilla.gnome.org 43171:
 	 * We don't know why this line is needed here, but if it's removed
 	 * then the bar won't shrink when we switch to the simple search bar
 	 * (though it does grow when switching to the complex one).
@@ -264,7 +264,7 @@ nautilus_switchable_search_bar_set_location (NautilusNavigationBar *navigation_b
 	/* Set the mode of the search bar,
 	   in case preferences have changed 
 	*/
-	/* FIXME bugzilla.eazel.com 2514:  This doesn't work yet. */
+	/* FIXME bugzilla.gnome.org 42514:  This doesn't work yet. */
 	mode = nautilus_search_uri_to_search_bar_mode (location);
 	nautilus_switchable_search_bar_set_mode (bar, mode);
 						 
@@ -296,7 +296,7 @@ gboolean
 nautilus_search_uri_is_displayable_by_mode (const char *uri,
 					    NautilusSearchBarMode mode)
 {
-	/* FIXME bugzilla.eazel.com 2514 */
+	/* FIXME bugzilla.gnome.org 42514 */
 	return TRUE;
 }
 
diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c
index 323651026..143bd5f9c 100644
--- a/src/nautilus-view-frame-corba.c
+++ b/src/nautilus-view-frame-corba.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h
index eebfe88a3..a6cd4ab75 100644
--- a/src/nautilus-view-frame-private.h
+++ b/src/nautilus-view-frame-private.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index f838169b7..3e03ad5cc 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index a0d55454b..05101876a 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index a57508d31..77be2b5bf 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -22,7 +22,7 @@
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
  *           John Sullivan <sullivan@eazel.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  */
 
 #include <config.h>
@@ -59,7 +59,7 @@
 #include <libnautilus-private/nautilus-monitor.h>
 #include <libnautilus-private/nautilus-search-uri.h>
 
-/* FIXME bugzilla.eazel.com 1243: 
+/* FIXME bugzilla.gnome.org 41243: 
  * We should use inheritance instead of these special cases
  * for the desktop window.
  */
@@ -210,7 +210,7 @@ window_set_title_with_time_stamp (NautilusWindow *window, const char *title)
 	time_stamp = nautilus_get_build_time_stamp ();
 	
 	if (time_stamp != NULL) {
-		/* FIXME bugzilla.eazel.com 5037: The text Preview
+		/* FIXME bugzilla.gnome.org 45037: The text Preview
 		 * Release is hardcoded here. Are all builds with
 		 * time stamps really best described as "preview
 		 * release"?.
@@ -491,7 +491,7 @@ viewed_file_changed_callback (NautilusFile *file,
                          */
                         end_location_change (window);
                         
-                        /* FIXME bugzilla.eazel.com 5038: Is closing
+                        /* FIXME bugzilla.gnome.org 45038: Is closing
                          * the window really the right thing to do for
                          * all cases?
                          */
@@ -612,7 +612,7 @@ update_for_new_location (NautilusWindow *window)
                                               window->details->location);
         
         /* Notify the sidebar of the location change. */
-        /* FIXME bugzilla.eazel.com 211:
+        /* FIXME bugzilla.gnome.org 40211:
          * Eventually, this will not be necessary when we restructure the 
          * sidebar itself to be a NautilusViewFrame.
          */
@@ -690,7 +690,7 @@ open_location (NautilusWindow *window,
         target_window = window;
         create_new_window = force_new_window;
 
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -699,7 +699,7 @@ open_location (NautilusWindow *window,
 	 * mode", always use another window. Either use the topmost window, 
 	 * or create a new window if the desktop is the topmost (and only).
 	 * However, this behavior was nearly universally disliked (see 
-	 * bugzilla.eazel.com bug 8122).
+	 * bugzilla.gnome.org bug 48122).
 	 */
         if (!create_new_window && NAUTILUS_IS_DESKTOP_WINDOW (window)) {
                 if (!NAUTILUS_DESKTOP_WINDOW (window)->affect_desktop_on_next_location_change) {
@@ -936,7 +936,7 @@ load_content_view (NautilusWindow *window,
         const char *iid;
         NautilusViewFrame *view;
 
- 	/* FIXME bugzilla.eazel.com 1243: 
+ 	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -1041,14 +1041,14 @@ handle_view_failure (NautilusWindow *window,
 	        if (view == window->content_view) {
 	                nautilus_window_set_content_view_widget (window, NULL);
 
-                        /* FIXME bugzilla.eazel.com 5039: We need a
+                        /* FIXME bugzilla.gnome.org 45039: We need a
                          * way to report the specific error that
                          * happens in this case - adapter factory not
                          * found, component failed to load, etc.
                          */
 	                report_current_content_view_failure_to_user (window, view);
 	        } else {
-                        /* FIXME bugzilla.eazel.com 5039: We need a
+                        /* FIXME bugzilla.gnome.org 45039: We need a
                          * way to report the specific error that
                          * happens in this case - adapter factory not
                          * found, component failed to load, etc.
@@ -1222,7 +1222,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                 break;
 
         case NAUTILUS_DETERMINE_VIEW_NO_HANDLER_FOR_TYPE:
-                /* FIXME bugzilla.eazel.com 866: Can't expect to read the
+                /* FIXME bugzilla.gnome.org 40866: Can't expect to read the
                  * permissions instantly here. We might need to wait for
                  * a stat first.
                  */
@@ -1234,7 +1234,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                                 (_("Couldn't display \"%s\", because Nautilus cannot determine what type of file it is."),
                                  uri_for_display);
         	} else {
-        		/* FIXME bugzilla.eazel.com 4932:
+        		/* FIXME bugzilla.gnome.org 44932:
         		 * Should distinguish URIs with no handlers at all from remote URIs
         		 * with local-only handlers.
         		 */
@@ -1288,7 +1288,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
 
 	case NAUTILUS_DETERMINE_VIEW_SERVICE_NOT_AVAILABLE:
 		if (nautilus_is_search_uri (location)) {
-			/* FIXME bugzilla.eazel.com 2458: Need to give
+			/* FIXME bugzilla.gnome.org 42458: Need to give
                          * the user better advice about what to do
                          * here.
                          */
@@ -1571,7 +1571,7 @@ zoom_level_changed_callback (NautilusViewFrame *view,
 	nautilus_bonobo_set_sensitive (window->details->shell_ui,
 				       NAUTILUS_COMMAND_ZOOM_NORMAL,
 				       TRUE);
-	/* FIXME bugzilla.eazel.com 3442: Desensitize "Zoom Normal"? */
+	/* FIXME bugzilla.gnome.org 43442: Desensitize "Zoom Normal"? */
 
 	nautilus_window_ui_thaw (window);
 }
@@ -1737,7 +1737,7 @@ load_underway_callback (NautilusViewFrame *view,
 {
         g_assert (NAUTILUS_IS_WINDOW (window));
 
-        /* FIXME bugzilla.eazel.com 2460: We intentionally ignore
+        /* FIXME bugzilla.gnome.org 42460: We intentionally ignore
          * progress from sidebar panels. Some sidebar panels may get
          * their own progress indicators later.
          */
@@ -1755,7 +1755,7 @@ load_complete_callback (NautilusViewFrame *view,
 {
         g_assert (NAUTILUS_IS_WINDOW (window));
 
-        /* FIXME bugzilla.eazel.com 2460: We intentionally ignore
+        /* FIXME bugzilla.gnome.org 42460: We intentionally ignore
          * progress from sidebar panels. Some sidebar panels may get
          * their own progress indicators later.
          */
diff --git a/src/nautilus-window-manage-views.h b/src/nautilus-window-manage-views.h
index b8ec7c113..22bd00482 100644
--- a/src/nautilus-window-manage-views.h
+++ b/src/nautilus-window-manage-views.h
@@ -20,7 +20,7 @@
  *  License along with this program; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  Author: Darin Adler <darin@eazel.com>
+ *  Author: Darin Adler <darin@bentspoon.com>
  *
  */
 
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index fd0ec973f..f1f41571b 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 
@@ -42,7 +42,7 @@ typedef enum {
         NAUTILUS_LOCATION_CHANGE_REDIRECT
 } NautilusLocationChangeType;
 
-/* FIXME bugzilla.eazel.com 2575: Migrate more fields into here. */
+/* FIXME bugzilla.gnome.org 42575: Migrate more fields into here. */
 struct NautilusWindowDetails
 {
         /* Bonobo. */
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 9658b42f5..eee803632 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -49,7 +49,7 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-theme.h>
 
-/* FIXME bugzilla.eazel.com 1243: 
+/* FIXME bugzilla.gnome.org 41243: 
  * We should use inheritance instead of these special cases
  * for the desktop window.
  */
@@ -281,7 +281,7 @@ set_up_special_bonobo_button (NautilusWindow *window,
 	bonobo_ui_toolbar_button_item_set_icon (item, pixbuf);
 	gdk_pixbuf_unref (pixbuf);
 
-	/* FIXME bugzilla.eazel.com 5005:
+	/* FIXME bugzilla.gnome.org 45005:
 	 * Setting the style here accounts for the preference, but does not
 	 * account for a hard-wired toolbar style or later changes in style
 	 * (such as if the toolbar is detached and made vertical). There
@@ -387,7 +387,7 @@ nautilus_window_initialize_toolbars (NautilusWindow *window)
 
 	CORBA_exception_init (&ev);
 
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1eb756080..2364df438 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -80,7 +80,7 @@
 #include <math.h>
 #include <sys/time.h>
 
-/* FIXME bugzilla.eazel.com 1243: 
+/* FIXME bugzilla.gnome.org 41243: 
  * We should use inheritance instead of these special cases
  * for the desktop window.
  */
@@ -349,7 +349,7 @@ nautilus_window_clear_status (gpointer callback_data)
 
 	nautilus_window_ui_freeze (window);
 
-	/* FIXME bugzilla.eazel.com 3597:
+	/* FIXME bugzilla.gnome.org 43597:
 	 * Should pass "" or NULL here. This didn't work, then did, now doesn't again.
 	 * When this is fixed in Bonobo we should change this line.
 	 */
@@ -728,7 +728,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	gtk_widget_show (location_bar_box);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -740,15 +740,15 @@ nautilus_window_constructed (NautilusWindow *window)
 		window->content_hbox = nautilus_horizontal_splitter_new ();
 		panel = E_PANED (window->content_hbox);
 		
-		/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
-		/* FIXME bugzilla.eazel.com 1245: No reality check on the value? */
+		/* FIXME bugzilla.gnome.org 41245: Saved in pixels instead of in %? */
+		/* FIXME bugzilla.gnome.org 41245: No reality check on the value? */
 		sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH);
 		e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
 	}
 	gtk_widget_show (window->content_hbox);
 	bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
 	
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -769,7 +769,7 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	bonobo_ui_component_freeze (window->details->shell_ui, NULL);
 
-	/* FIXME bugzilla.eazel.com 1243: 
+	/* FIXME bugzilla.gnome.org 41243: 
 	 * We should use inheritance instead of these special cases
 	 * for the desktop window.
 	 */
@@ -783,7 +783,7 @@ nautilus_window_constructed (NautilusWindow *window)
 		nautilus_bonobo_set_hidden (window->details->shell_ui,
 					    MENU_BAR_PATH, TRUE);
 
-		/* FIXME bugzilla.eazel.com 4752:
+		/* FIXME bugzilla.gnome.org 44752:
 		 * If we ever get the unsigned math errors in
 		 * gtk_menu_item_size_allocate fixed this can be removed.
 		 */
@@ -1411,7 +1411,7 @@ chose_component_callback (NautilusViewIdentifier *identifier, gpointer callback_
 		nautilus_window_set_content_view (window, identifier);
 	}
 	
-	/* FIXME bugzilla.eazel.com 1334: There should be some global
+	/* FIXME bugzilla.gnome.org 41334: There should be some global
 	 * way to signal that the file type associations have changed,
 	 * so that the places that display these lists can react. For
 	 * now, hardwire this case, which is the most obvious one by
@@ -1982,7 +1982,7 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 		 */
 		nautilus_window_ui_update (window);
 
-		/* FIXME bugzilla.eazel.com 1243: 
+		/* FIXME bugzilla.gnome.org 41243: 
 		 * We should use inheritance instead of these special cases
 		 * for the desktop window.
 		 */
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index d0c43122f..0e764d3e3 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Authors: Elliot Lee <sopwith@redhat.com>
- *           Darin Adler <darin@eazel.com>
+ *           Darin Adler <darin@bentspoon.com>
  *
  */
 /* nautilus-window.h: Interface of the main window object */