Updated bugzilla.eazel.com references to refer to the

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

140 files changed, 373 insertions, 367 deletions

diff --git a/ChangeLog b/ChangeLog
index b7e105a49..4f236e1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-15  Darin Adler  <darin@bentspoon.com>
+
+	Updated bugzilla.eazel.com references to refer to the
+	corresponding bugzilla.gnome.org bug. Also updated my
+	email address.
+
 2001-09-14  Darin Adler  <darin@bentspoon.com>
 
 	* libnautilus-private/nautilus-monitor.c:
diff --git a/HACKING b/HACKING
index d90ed2377..b43659145 100644
--- a/HACKING
+++ b/HACKING
@@ -19,7 +19,7 @@ http://developer.gnome.org/tools/cvs.html details how to get started
 with GNOME CVS.
 
 If you want to contribute patches, please send mail to the nautilus
-maintainer (Darin Adler <darin@eazel.com>) and/or the nautilus mailing
+maintainer (Darin Adler <darin@bentspoon.com>) and/or the nautilus mailing
 list: <nautilus-list@lists.eazel.com> (subscriptions should be made to
 <nautilus-list-request@lists.eazel.com> with "subscribe" as a
 subject).
diff --git a/README b/README
index 2467f87ce..8199e7339 100644
--- a/README
+++ b/README
@@ -21,7 +21,7 @@ README instead.
 ==========
 
 If you would like to hack on Nautilus, or have patches, please send
-mail to the Nautilus maintainer: Darin Adler <darin@eazel.com>.
+mail to the Nautilus maintainer: Darin Adler <darin@bentspoon.com>.
 Patches should also be sent to the Nautilus mailing list:
 <nautilus-list@lists.eazel.com>
 
diff --git a/TODO b/TODO
index ccd02ac9f..38a2bfea8 100644
--- a/TODO
+++ b/TODO
@@ -1 +1 @@
-You can see our planned task list in http://bugzilla.eazel.com
+You can see our planned tasks as bugs in http://bugzilla.gnome.org.
diff --git a/check-FIXME.pl b/check-FIXME.pl
index c27e21a7a..91fccf404 100755
--- a/check-FIXME.pl
+++ b/check-FIXME.pl
@@ -20,7 +20,7 @@
 #  along with this library; 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>,
 #
 
 # check-FIXME.pl: Search for FIXMEs in the sources and correlate them
@@ -62,10 +62,10 @@ close FILE;
 print "Searching the bugzilla database's product $product for open FIXME bugs\n";
 
 if (!grep /$product/, ( "nautilus", "gnome-vfs", "medusa", "oaf")) {
-    print "Can't find your product in the bugzilla.eazel.com database\n";
+    print "Can't find your product in the bugzilla.gnome.org database\n";
 }
 
-my $bugzilla_query_bug_url = "http://bugzilla.eazel.com/buglist.cgi?";
+my $bugzilla_query_bug_url = "http://bugzilla.gnome.org/buglist.cgi?";
 
 $product =~ s/\-/\+/g;
 my @cgi_options = ("bug_status=NEW",
@@ -98,7 +98,7 @@ foreach my $file (@ARGV)
     while (<FILE>)
       {
         next if !/FIXME/;
-        if (/FIXME\s*:?\s*bugzilla.eazel.com\s+(\d+)/)
+        if (/FIXME\s*:?\s*bugzilla.gnome.org\s+(\d+)/)
           {
             $bug_lines{$1} .= "$file:$.:$_";
           }
@@ -121,7 +121,7 @@ print "\n";
 foreach my $bug_number (keys %bugs_in_bugzilla) {
     if ($bugs_in_bugzilla{$bug_number} eq "UNFOUND") {
         # Also check that the 
-        my $bug_url = "http://bugzilla.eazel.com/show_bug.cgi?id=".$bug_number;
+        my $bug_url = "http://bugzilla.gnome.org/show_bug.cgi?id=".$bug_number;
         my $bug_page = `wget -q -O - $bug_url`;
         if (!($bug_page =~ /This is not a FIXME bug/i)) {
           $bug_page =~ /<A HREF=\"bug_status.html\#assigned_to\">Assigned To:<\/A><\/B><\/TD>\s+<TD>([^<]+)<\/TD>/s;
@@ -148,7 +148,7 @@ sub numerically { $a <=> $b; }
 foreach my $bug (sort numerically keys %bug_lines)
   {
     # Check and see if the bug is open.
-    my $page = `wget -q -O - http://bugzilla.eazel.com/show_bug.cgi?id=$bug`;
+    my $page = `wget -q -O - http://bugzilla.gnome.org/show_bug.cgi?id=$bug`;
     $page =~ tr/\n/ /;
     my $status = "unknown";
     $status = $1 if $page =~ m|Status:.*</TD>\s*<TD>([A-Z]+)</TD>|;
diff --git a/check-POTFILES.pl b/check-POTFILES.pl
index 13d2c59e8..247cfa0b7 100755
--- a/check-POTFILES.pl
+++ b/check-POTFILES.pl
@@ -20,7 +20,7 @@
 #  along with this library; 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>,
 #
 
 # check-POTFILES.pl: Checks for files mentioned in POTFILES.in that
diff --git a/check-THANKS.pl b/check-THANKS.pl
index a025718fe..8e0893e4b 100755
--- a/check-THANKS.pl
+++ b/check-THANKS.pl
@@ -128,7 +128,7 @@ while (<CHANGELOGS>)
           }
         else
           {
-            # FIXME bugzilla.eazel.com 3452: we should also try to extract
+            # FIXME bugzilla.gnome.org 43452: we should also try to extract
             # names & addresses from entry body text.
             next; # ignore unknown lines for now
           }
diff --git a/check-config-h.pl b/check-config-h.pl
index d83a59738..e4668203a 100755
--- a/check-config-h.pl
+++ b/check-config-h.pl
@@ -20,7 +20,7 @@
 #  along with this library; 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>,
 #
 
 # check-config-h.pl: Search for .c files where someone forgot to
diff --git a/check-headers-in-Makefile.pl b/check-headers-in-Makefile.pl
index ed6694cc2..3c92fcdd7 100755
--- a/check-headers-in-Makefile.pl
+++ b/check-headers-in-Makefile.pl
@@ -20,7 +20,7 @@
 #  along with this library; 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>,
 #
 
 # check-headers-in-Makefile.pl: Checks the contents of the source
diff --git a/check-signals.pl b/check-signals.pl
index 822c20e04..62803e381 100755
--- a/check-signals.pl
+++ b/check-signals.pl
@@ -20,7 +20,7 @@
 #  along with this script; 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>,
 #
 
 # check-signals.pl: Search for .c files where someone forgot to
diff --git a/check-strings.pl b/check-strings.pl
index 9be7d7842..86126c95b 100755
--- a/check-strings.pl
+++ b/check-strings.pl
@@ -20,7 +20,7 @@
 #  along with this library; 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>,
 #
 
 # check-strings.pl: Search for .c and .h files where someone forgot
diff --git a/components/adapter/bonobo-stream-vfs.c b/components/adapter/bonobo-stream-vfs.c
index 8e843ef37..4aa29483a 100644
--- a/components/adapter/bonobo-stream-vfs.c
+++ b/components/adapter/bonobo-stream-vfs.c
@@ -27,7 +27,7 @@
  * bonobo-stream-vfs.c: Gnome VFS-based Stream implementation
  */
 
-/* FIXME bugzilla.eazel.com 4400: There's another copy of this file,
+/* FIXME bugzilla.gnome.org 44400: There's another copy of this file,
  * with a few subtle differences, in the Bonobo sources, although it's
  * currently not being compiled.  
  */
@@ -55,7 +55,7 @@ vfs_get_info (BonoboStream *stream,
 	      Bonobo_StorageInfoFields mask,
 	      CORBA_Environment *ev)
 {
-	/* FIXME bugzilla.eazel.com 4402: Is it OK to have this
+	/* FIXME bugzilla.gnome.org 44402: Is it OK to have this
 	 * unimplemented? 
 	 */
 	g_warning ("BonoboStreamVFS:get_info not implemented");
@@ -71,7 +71,7 @@ vfs_set_info (BonoboStream *stream,
 	      Bonobo_StorageInfoFields mask,
 	      CORBA_Environment *ev)
 {
-	/* FIXME bugzilla.eazel.com 4403: Is it OK to have this
+	/* FIXME bugzilla.gnome.org 44403: Is it OK to have this
 	 * unimplemented? 
 	 */
 	g_warning ("BonoboStreamVFS:set_info not implemented");
@@ -92,7 +92,7 @@ vfs_write (BonoboStream *stream,
 
 	res = gnome_vfs_write (stream_vfs->details->handle, buffer->_buffer, buffer->_length, &written);
 	if (res != GNOME_VFS_OK) {
-		/* FIXME bugzilla.eazel.com 4396: We might need to
+		/* FIXME bugzilla.gnome.org 44396: We might need to
 		 * distinguish NoPermission from IOError.  
 		 */
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
@@ -130,7 +130,7 @@ vfs_read (BonoboStream *stream,
 		CORBA_free (data);
 		CORBA_free (*buffer);
 		*buffer = NULL;
-		/* FIXME bugzilla.eazel.com 4396: We might need to
+		/* FIXME bugzilla.gnome.org 44396: We might need to
 		 * distinguish NoPermission from IOError.  
 		 */
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
@@ -214,7 +214,7 @@ vfs_copy_to  (BonoboStream *stream,
 
 	res = gnome_vfs_create (&fd_out, dest, GNOME_VFS_OPEN_WRITE, FALSE, 0666);
 	if (res != GNOME_VFS_OK) {
-		/* FIXME bugzilla.eazel.com 4398: Need to set exception here. */
+		/* FIXME bugzilla.gnome.org 44398: Need to set exception here. */
 		return;
 	}
 
@@ -227,14 +227,14 @@ vfs_copy_to  (BonoboStream *stream,
 	do {
 		res = gnome_vfs_read (stream_vfs->details->handle, data, MIN (READ_CHUNK_SIZE, more), &rsize);
 		if (res != GNOME_VFS_OK) {
-			/* FIXME bugzilla.eazel.com 4398: Need to set exception here. */
+			/* FIXME bugzilla.gnome.org 44398: Need to set exception here. */
 			break;
 		}
 		*read_bytes += rsize;
 
 		res = gnome_vfs_write (fd_out, data, rsize, &wsize);
 		if (res != GNOME_VFS_OK) {
-			/* FIXME bugzilla.eazel.com 4398: Need to set exception here. */
+			/* FIXME bugzilla.gnome.org 44398: Need to set exception here. */
 			break;
 		}
 		*written_bytes += wsize;
@@ -272,7 +272,7 @@ vfs_destroy (GtkObject *object)
 
 	if (stream_vfs->details->handle != NULL) {
 		gnome_vfs_close (stream_vfs->details->handle);
-		/* FIXME bugzilla.eazel.com 4399: Errors that happen
+		/* FIXME bugzilla.gnome.org 44399: Errors that happen
 		 * only at flush time are lost here. Many gnome-vfs
 		 * modules return errors at close time about the
 		 * remaining flushed writes.  
@@ -437,7 +437,7 @@ bonobo_stream_vfs_open (const char *uri, Bonobo_Storage_OpenMode mode)
 	} else if (mode == Bonobo_Storage_WRITE) {
 		result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_WRITE);
 	} else {
-		/* FIXME bugzilla.eazel.com 4401: Do we need to
+		/* FIXME bugzilla.gnome.org 44401: Do we need to
 		 * support CREATE, FAILIFEXIST, COMPRESSED,
 		 * TRANSACTED, or combinations?  
 		 */
diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.c b/components/adapter/nautilus-adapter-control-embed-strategy.c
index 97b6bf1a3..280a349aa 100644
--- a/components/adapter/nautilus-adapter-control-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-control-embed-strategy.c
@@ -141,7 +141,7 @@ activate_uri_callback (BonoboControlFrame *frame,
 		       gboolean relative,
 		       NautilusAdapterControlEmbedStrategy *strategy)
 {
-	/* FIXME bugzilla.eazel.com 4404: ignoring `relative' parameter as
+	/* FIXME bugzilla.gnome.org 44404: ignoring `relative' parameter as
 	 * the concept is kind of broken. 
 	 */
 	nautilus_adapter_embed_strategy_emit_open_location (NAUTILUS_ADAPTER_EMBED_STRATEGY (strategy), 
diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c
index 45673322b..81d998c83 100644
--- a/components/adapter/nautilus-adapter-progressive-load-strategy.c
+++ b/components/adapter/nautilus-adapter-progressive-load-strategy.c
@@ -249,7 +249,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
 
 	CORBA_exception_init (&ev);
 
-	/* FIXME bugzilla.eazel.com 3455: this code is stupid and
+	/* FIXME bugzilla.gnome.org 43455: this code is stupid and
            loads the component in a way that blocks the nautilus
            adapter component, which is pointless/stupid; it should be
            async. */
diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.c b/components/adapter/nautilus-adapter-stream-load-strategy.c
index 1c79c2539..08e8e4e7a 100644
--- a/components/adapter/nautilus-adapter-stream-load-strategy.c
+++ b/components/adapter/nautilus-adapter-stream-load-strategy.c
@@ -132,7 +132,7 @@ nautilus_adapter_stream_load_strategy_load_location (NautilusAdapterLoadStrategy
 	if (stream == NULL) {
 		nautilus_adapter_load_strategy_report_load_failed (abstract_strategy);
 	} else {
-		/* FIXME bugzilla.eazel.com 1248: 
+		/* FIXME bugzilla.gnome.org 41248: 
 		 * Dan Winship points out that we should pass the
 		 * MIME type here to work with new implementers of
 		 * PersistStream that pay attention to the MIME type. It
@@ -167,5 +167,5 @@ nautilus_adapter_stream_load_strategy_stop_loading  (NautilusAdapterLoadStrategy
 {
 	g_return_if_fail (NAUTILUS_IS_ADAPTER_STREAM_LOAD_STRATEGY (strategy));
 
-	/* FIXME bugzilla.eazel.com 3456: is there anything we can do? */
+	/* FIXME bugzilla.gnome.org 43456: is there anything we can do? */
 }
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c
index c78d7b348..f2c918c5d 100644
--- a/components/adapter/nautilus-adapter.c
+++ b/components/adapter/nautilus-adapter.c
@@ -156,7 +156,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
 	CORBA_Environment     ev;
 
 
-	/* FIXME bugzilla.eazel.com 4405: should be done with
+	/* FIXME bugzilla.gnome.org 44405: should be done with
 	 * construct args 
 	 */
 
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
index ab7ddf5d0..b77e5807f 100644
--- a/components/hardware/nautilus-hardware-view.c
+++ b/components/hardware/nautilus-hardware-view.c
@@ -293,7 +293,7 @@ get_CPU_description (int nth)
          * ("," for many European countries).
          */
 
-        /* FIXME bugzilla.eazel.com 5298: The KB string that comes
+        /* FIXME bugzilla.gnome.org 45298: The KB string that comes
          * from the proc data is wrong -- "kB" is correct, and we use
          * "K" for file sizes as of this writing (although we use "MB"
          * and "GB").
diff --git a/components/help/help-method.c b/components/help/help-method.c
index 5b03da6e5..bdd0080dc 100644
--- a/components/help/help-method.c
+++ b/components/help/help-method.c
@@ -148,7 +148,7 @@ help_uri_to_string (HelpURI *help_uri)
 	case UNKNOWN_FILE:
 		return NULL;
 	default:
-		/* FIXME bugzilla.eazel.com 2401: 
+		/* FIXME bugzilla.gnome.org 42401: 
 		 * An assert at runtime may be a bit harsh.
                  * We'd prefer behavior more like g_return_if_fail.
                  * In glib 2.0 we can use g_return_val_if_reached.
@@ -219,7 +219,7 @@ convert_file_to_uri (HelpURI *help_uri, char *file)
 	} else if (g_strcasecmp (mime_type, "text/html") == 0) {
 		help_uri->type = HTML_FILE;
 	} else if (g_strcasecmp (mime_type, "application/x-troff-man") == 0) {
-                /* FIXME bugzilla.eazel.com 2402: 
+                /* FIXME bugzilla.gnome.org 42402: 
                  * The check above used to check for a prefix
                  * of "application/x-troff-man", but now we check for
                  * an exact string match. Is that what we really want?
@@ -272,7 +272,7 @@ strdup_string_to_substring_end (const char *string, const char *substring)
 }
 
 /*
- * bugzilla.eazel.com 6761:
+ * bugzilla.gnome.org 46761:
  * Automatically promote requests for html help to sgml help
  * if available
  *
diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index a136419b8..41ce44ae6 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.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/components/mozilla/bonobo-extensions.c b/components/mozilla/bonobo-extensions.c
index c504a0649..c419e499b 100644
--- a/components/mozilla/bonobo-extensions.c
+++ b/components/mozilla/bonobo-extensions.c
@@ -22,7 +22,7 @@
    Boston, MA 02111-1307, USA.
 
    Authors: John Sullivan <sullivan@eazel.com>
-            Darin Adler <darin@eazel.com>
+            Darin Adler <darin@bentspoon.com>
 */
 
 /* FIXME: This file copied intactly from libnautilus-private
diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index ec43d9b9e..edf7c2ed8 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -1643,7 +1643,7 @@ make_full_uri_from_relative (const char *base_uri, const char *uri)
 
 	/* See section 5.2 in RFC 2396 */
 
-	/* FIXME bugzilla.eazel.com 4413: This function does not take
+	/* FIXME bugzilla.gnome.org 44413: This function does not take
 	 * into account a BASE tag in an HTML document, so its
 	 * functionality differs from what Mozilla itself would do.
 	 */
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index f277e5c31..2bbf25216 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -1989,7 +1989,7 @@ nautilus_music_view_drag_data_received (GtkWidget *widget, GdkDragContext *conte
 	switch (info) {
         case TARGET_GNOME_URI_LIST:
         case TARGET_URI_LIST: 	
-                /* FIXME bugzilla.eazel.com 2406: 
+                /* FIXME bugzilla.gnome.org 42406: 
                  * the music view should accept mp3 files.
                  */
                 break;
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 4bbedda80..fc826037b 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -42,7 +42,7 @@
 #include <libnautilus/nautilus-clipboard.h>
 #include <libnautilus/nautilus-view-standard-main.h>
 
-/* FIXME bugzilla.eazel.com 4436: 
+/* FIXME bugzilla.gnome.org 44436: 
  * Undo not working in notes-view.
  */
 #if 0
@@ -178,7 +178,7 @@ load_note_text_from_metadata (NautilusFile *file,
 		g_free (saved_text);
 	}
 	
-/* FIXME bugzilla.eazel.com 4436: 
+/* FIXME bugzilla.gnome.org 44436: 
  * Undo not working in notes-view.
  */
 #if 0
@@ -290,7 +290,7 @@ notes_load_location (NautilusView *view,
                      Notes *notes)
 {
         if (strcmp (notes->uri, location) != 0) {
-/* FIXME bugzilla.eazel.com 4436: 
+/* FIXME bugzilla.gnome.org 44436: 
  * Undo not working in notes-view.
  */
 #if 0
@@ -406,7 +406,7 @@ make_notes_view (const char *iid, gpointer callback_data)
                  nautilus_view_get_bonobo_control (notes->view),
                  FALSE);
 
-/* FIXME bugzilla.eazel.com 4436: 
+/* FIXME bugzilla.gnome.org 44436: 
  * Undo not working in notes-view.
  */
 #if 0
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index 3d066ff38..3877a8ef7 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -763,12 +763,12 @@ merge_bonobo_menu_items (BonoboControl *control, gboolean state, gpointer user_d
 	text_view = NAUTILUS_TEXT_VIEW (user_data);
 
 	if (state) {
-                /* FIXME bugzilla.eazel.com 1274:
+                /* FIXME bugzilla.gnome.org 41274:
                  * See nautilus-text-view-ui.xml.  Need to query system for
                  * available fonts instead of hard coding the font list
                  */
 
-                /* FIXME bugzilla.eazel.com 7907: 
+                /* FIXME bugzilla.gnome.org 47907: 
                  * The "GTK System Font" string is hard coded in many places.
                  * Please see nautilus-text-view-ui.xml.
                  */
diff --git a/components/tree/libmain.c b/components/tree/libmain.c
index 2d077fdbb..39bf34263 100644
--- a/components/tree/libmain.c
+++ b/components/tree/libmain.c
@@ -31,7 +31,7 @@
 #include <bonobo.h>
 #include <liboaf/liboaf.h>
 
-/* FIXME bugzilla.eazel.com 2736: oaf_plugin_unuse can't possibly work! this sucks */
+/* FIXME bugzilla.gnome.org 42736: oaf_plugin_unuse can't possibly work! this sucks */
 #if 0
 static void
 tree_shlib_object_destroyed (GtkObject *object)
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index 16194e7f3..798a46fbf 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -387,7 +387,7 @@ nautilus_tree_view_drag_motion (GtkWidget *widget, GdkDragContext *context,
 	return TRUE;
 }
 
-/* FIXME bugzilla.eazel.com 7445: Needs to become a shared function */
+/* FIXME bugzilla.gnome.org 47445: Needs to become a shared function */
 static void
 get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context, guint32 time)
 {
@@ -1111,7 +1111,7 @@ nautilus_tree_view_get_drop_action (NautilusTreeView *tree_view,
 
 	drag_info = NAUTILUS_TREE_VIEW (tree_view)->details->dnd->drag_info;
 
-	/* 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. */
 
 	if (!drag_info->got_drop_data_type) {
 		/* drag_data_received didn't get called yet */
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index be14f9c39..b4d733c08 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -928,7 +928,7 @@ create_tree (NautilusTreeView *view)
 
 	update_smooth_graphics_mode (view);
 
-	/* FIXME bugzilla.eazel.com 6820:
+	/* FIXME bugzilla.gnome.org 46820:
 	 * Using the NautilusFile comparison function to sort by
 	 * is way too slow when opening large directories (those with
 	 * 1000s of files). So to fix bug 6988 we're reverting back
diff --git a/docs/style-guide.html b/docs/style-guide.html
index d0881c5ed..d29c52e07 100644
--- a/docs/style-guide.html
+++ b/docs/style-guide.html
@@ -19,7 +19,7 @@ to be re-emphasized because people don't follow them often enough.</p>
 Eventually I'd like better organization and tons of examples.</p>
 
 <blockquote>
-<p>- <a href="mailto:darin@eazel.com">Darin</a></p>
+<p>- <a href="mailto:darin@bentspoon.com">Darin</a></p>
 </blockquote>
 
 <hr>
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index b7da068c8..f4cc80391 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -22,7 +22,7 @@
    Boston, MA 02111-1307, USA.
 
    Authors: John Sullivan <sullivan@eazel.com>
-            Darin Adler <darin@eazel.com>
+            Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-default-file-icon.c b/libnautilus-private/nautilus-default-file-icon.c
index dd103781c..fda4cbeed 100644
--- a/libnautilus-private/nautilus-default-file-icon.c
+++ b/libnautilus-private/nautilus-default-file-icon.c
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-default-file-icon.h b/libnautilus-private/nautilus-default-file-icon.h
index c35e909e0..d87248083 100644
--- a/libnautilus-private/nautilus-default-file-icon.h
+++ b/libnautilus-private/nautilus-default-file-icon.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_DEFAULT_FILE_ICON_H
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index ef61a31b6..77860bf82 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -544,7 +544,7 @@ nautilus_directory_set_up_request (Request *request,
 		 NAUTILUS_FILE_ATTRIBUTE_METADATA,
 		 eel_strcmp_compare_func) != NULL;
 
-	/* FIXME bugzilla.eazel.com 2435:
+	/* FIXME bugzilla.gnome.org 42435:
 	 * Some file attributes are really pieces of metadata.
 	 * This is a confusing/broken design, since other metadata
 	 * pieces are handled separately from file attributes. There
@@ -767,7 +767,7 @@ dequeue_pending_idle_callback (gpointer callback_data)
 		file_info = node->data;
 
 		/* Update the file count. */
-		/* FIXME bugzilla.eazel.com 5063: This could count a file twice if we get it
+		/* FIXME bugzilla.gnome.org 45063: This could count a file twice if we get it
 		 * from both load_directory and from
 		 * new_files_callback. Not too hard to fix by moving
 		 * this into the actual callback instead of waiting
@@ -2721,7 +2721,7 @@ activation_uri_nautilus_link_read_callback (GnomeVFSResult result,
 
 	/* Handle the case where we read the Nautilus link. */
 	if (result != GNOME_VFS_OK) {
-		/* FIXME bugzilla.eazel.com 2433: We should report this error to the user. */
+		/* FIXME bugzilla.gnome.org 42433: We should report this error to the user. */
 		g_free (file_contents);
 		uri = NULL;
 	} else {
@@ -2753,7 +2753,7 @@ activation_uri_gmc_link_read_callback (GnomeVFSResult result,
 
 	/* Handle the case where we read the GMC link. */
 	if (result != GNOME_VFS_OK || !eel_str_has_prefix (file_contents, "URL: ")) {
-		/* FIXME bugzilla.eazel.com 2433: We should report this error to the user. */
+		/* FIXME bugzilla.gnome.org 42433: We should report this error to the user. */
 		uri = NULL;
 	} else {
 		/* Make sure we don't run off the end of the buffer. */
@@ -3017,7 +3017,7 @@ cancel_loading_attributes (NautilusDirectory *directory,
 		file_info_cancel (directory);
 	}
 	
-	/* FIXME bugzilla.eazel.com 5064: implement cancelling metadata when we
+	/* FIXME bugzilla.gnome.org 45064: implement cancelling metadata when we
 	   implement invalidating metadata */
 
 	nautilus_directory_async_state_changed (directory);
@@ -3052,7 +3052,7 @@ nautilus_directory_cancel_loading_file_attributes (NautilusDirectory *directory,
 		cancel_activation_uri_for_file (directory, file);
 	}
 
-	/* FIXME bugzilla.eazel.com 5064: implement cancelling metadata when we
+	/* FIXME bugzilla.gnome.org 45064: implement cancelling metadata when we
 	   implement invalidating metadata */
 
 	nautilus_directory_async_state_changed (directory);
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 2785b0bef..72176fc04 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -21,7 +21,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -283,7 +283,7 @@ nautilus_file_background_read_desktop_settings (char **color,
 		 	default:
 		 		g_assert_not_reached ();
 			case WALLPAPER_EMBOSSED:
-				/* FIXME bugzilla.eazel.com 2193: we don't support embossing.
+				/* FIXME bugzilla.gnome.org 42193: we don't support embossing.
 				 * Just treat it as centered - ugh.
 				 */
 			case WALLPAPER_CENTERED:
@@ -503,7 +503,7 @@ nautilus_file_background_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, g
 		}
 		
 	    	background = EEL_BACKGROUND (data);
-	    	/* FIXME bugzilla.eazel.com 2220:
+	    	/* FIXME bugzilla.gnome.org 42220:
 	    	 * We'd like to call saved_settings_changed_callback right here, directly.
 	    	 * However, the current version of the property-background capplet saves
 	    	 * the new setting in gnome_config AFTER setting the root window's property -
diff --git a/libnautilus-private/nautilus-directory-background.h b/libnautilus-private/nautilus-directory-background.h
index 3acf7b14b..d168ea223 100644
--- a/libnautilus-private/nautilus-directory-background.h
+++ b/libnautilus-private/nautilus-directory-background.h
@@ -21,7 +21,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <gtk/gtkwidget.h>
diff --git a/libnautilus-private/nautilus-directory-metafile.c b/libnautilus-private/nautilus-directory-metafile.c
index db6b369ef..fdd831b8e 100644
--- a/libnautilus-private/nautilus-directory-metafile.c
+++ b/libnautilus-private/nautilus-directory-metafile.c
@@ -19,7 +19,7 @@
    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>,
             Mike Engber <engber@eazel.com>
 */
 
@@ -172,7 +172,7 @@ nautilus_directory_is_metadata_read (NautilusDirectory *directory)
 
 	result = Nautilus_Metafile_is_read (metafile, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
@@ -204,7 +204,7 @@ nautilus_directory_get_file_metadata (NautilusDirectory *directory,
 
 	corba_value = Nautilus_Metafile_get (metafile, file_name, key, non_null_default, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
@@ -245,7 +245,7 @@ nautilus_directory_get_file_metadata_list (NautilusDirectory *directory,
 
 	corba_value = Nautilus_Metafile_get_list (metafile, file_name, list_key, list_subkey, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
@@ -287,7 +287,7 @@ nautilus_directory_set_file_metadata (NautilusDirectory *directory,
 
 	Nautilus_Metafile_set (metafile, file_name, key, default_metadata, metadata, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 }
@@ -337,7 +337,7 @@ nautilus_directory_set_file_metadata_list (NautilusDirectory *directory,
 
 	Nautilus_Metafile_set_list (metafile, file_name, list_key, list_subkey, corba_list, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
@@ -459,7 +459,7 @@ nautilus_directory_copy_file_metadata (NautilusDirectory *source_directory,
 
 	Nautilus_Metafile_copy (source_metafile, source_file_name, destination_uri, destination_file_name, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (source_metafile, NULL);
 
@@ -481,7 +481,7 @@ nautilus_directory_remove_file_metadata (NautilusDirectory *directory,
 
 	Nautilus_Metafile_remove (metafile, file_name, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 }
@@ -503,7 +503,7 @@ nautilus_directory_rename_file_metadata (NautilusDirectory *directory,
 
 	Nautilus_Metafile_rename (metafile, old_file_name, new_file_name, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, &ev);
 }
@@ -523,7 +523,7 @@ nautilus_directory_rename_directory_metadata (NautilusDirectory *directory,
 
 	Nautilus_Metafile_rename_directory (metafile, new_directory_uri, &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, &ev);
 }
@@ -551,7 +551,7 @@ nautilus_directory_register_metadata_monitor (NautilusDirectory *directory)
 		 bonobo_object_corba_objref (BONOBO_OBJECT (directory->details->metafile_monitor)),
 		 &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 }
@@ -574,7 +574,7 @@ nautilus_directory_unregister_metadata_monitor (NautilusDirectory *directory)
 		 bonobo_object_corba_objref (BONOBO_OBJECT (directory->details->metafile_monitor)),
 		 &ev);
 
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	CORBA_exception_free (&ev);
 	bonobo_object_release_unref (metafile, NULL);
 
diff --git a/libnautilus-private/nautilus-directory-metafile.h b/libnautilus-private/nautilus-directory-metafile.h
index ffe6eb4a5..2400da573 100644
--- a/libnautilus-private/nautilus-directory-metafile.h
+++ b/libnautilus-private/nautilus-directory-metafile.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include "nautilus-directory.h"
diff --git a/libnautilus-private/nautilus-directory-notify.h b/libnautilus-private/nautilus-directory-notify.h
index c2b1bdd1c..ec5adec36 100644
--- a/libnautilus-private/nautilus-directory-notify.h
+++ b/libnautilus-private/nautilus-directory-notify.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <glib.h>
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index bbed4537a..540fae4a6 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include "nautilus-directory-metafile-monitor.h"
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index dbb393ea8..da5a91cc8 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -306,7 +306,7 @@ nautilus_directory_make_uri_canonical (const char *uri)
 	/* To NautilusDirectory, a uri with or without a trailing
 	 * / is equivalent. This is necessary to prevent separate
 	 * NautilusDirectories for the same location from being
-	 * created. (See bugzilla.eazel.com 3322 for an example.)
+	 * created. (See bugzilla.gnome.org 43322 for an example.)
 	 */
 	canonical = eel_str_strip_trailing_chr (canonical_maybe_trailing_slash, '/');
 	if (strcmp (canonical, canonical_maybe_trailing_slash) != 0) {
@@ -1773,7 +1773,7 @@ nautilus_self_check_directory (void)
 	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/"), "http://le-hackeur.org");
 	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir"), "http://le-hackeur.org/dir");
 	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("http://le-hackeur.org/dir/"), "http://le-hackeur.org/dir");
-	/* FIXME bugzilla.eazel.com 5068: the "nested" URI loses some characters here. Maybe that's OK because we escape them in practice? */
+	/* FIXME bugzilla.gnome.org 45068: the "nested" URI loses some characters here. Maybe that's OK because we escape them in practice? */
 	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("search://[file://]file_name contains stuff"), "search://[file/]file_name contains stuff");
 	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:/~turtle"), "eazel-services:///~turtle");
 	EEL_CHECK_STRING_RESULT (nautilus_directory_make_uri_canonical ("eazel-services:///~turtle"), "eazel-services:///~turtle");
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 1b24f44b9..e5970c2a9 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_DIRECTORY_H
@@ -57,10 +57,10 @@
 typedef struct NautilusFile NautilusFile;
 #endif
 
-/* FIXME bugzilla.eazel.com 5382:
+/* FIXME bugzilla.gnome.org 45382:
  * Increase or remove this limit? 
  */
-/* FIXME bugzilla.eazel.com 5603:
+/* FIXME bugzilla.gnome.org 45603:
  * This limit is not actually "hard", which can lead to some minor UI problems.
  */
 #define NAUTILUS_DIRECTORY_FILE_LIST_HARD_LIMIT     4000
diff --git a/libnautilus-private/nautilus-file-attributes.h b/libnautilus-private/nautilus-file-attributes.h
index e4b3a8406..c71e8caf6 100644
--- a/libnautilus-private/nautilus-file-attributes.h
+++ b/libnautilus-private/nautilus-file-attributes.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_FILE_ATTRIBUTES_H
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index f9f9ed49c..f9dbb76f3 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1723,7 +1723,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 	duplicate = copy_action != GDK_ACTION_MOVE;
 	for (p = item_uris; p != NULL; p = p->next) {
 		/* Filter out special Nautilus link files */
-		/* FIXME bugzilla.eazel.com 5295: 
+		/* FIXME bugzilla.gnome.org 45295: 
 		 * This is surprising behavior -- the user drags the Trash icon (say)
 		 * to a folder, releases it, and nothing whatsoever happens. Don't we want
 		 * a dialog in this case?
@@ -2289,7 +2289,7 @@ nautilus_self_check_file_operations (void)
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy).txt"), 1), _("foo foo (25th copy).txt"));
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (100000000000000th copy).txt"), 1), _("foo foo (copy).txt"));
 
-	/* FIXME bugzilla.eazel.com 7701: These are wrong. */
+	/* FIXME bugzilla.gnome.org 47701: These are wrong. */
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy)"), 1), _("foo (11st copy)"));
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy).txt"), 1), _("foo (11st copy).txt"));
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy)"), 1), _("foo (12nd copy)"));
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index c1cd54ef4..3df51e700 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_FILE_PRIVATE_H
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index ecce168f6..8e8276957 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -113,7 +113,7 @@ nautilus_get_user_directory (void)
 
 	if (!g_file_exists (user_directory)) {
 		mkdir (user_directory, DEFAULT_NAUTILUS_DIRECTORY_MODE);
-		/* FIXME bugzilla.eazel.com 1286: 
+		/* FIXME bugzilla.gnome.org 41286: 
 		 * How should we handle the case where this mkdir fails? 
 		 * Note that nautilus_application_startup will refuse to launch if this 
 		 * directory doesn't get created, so that case is OK. But the directory 
@@ -143,7 +143,7 @@ nautilus_get_desktop_directory (void)
 		desktop_directory = nautilus_get_gmc_desktop_directory ();
 		if (!g_file_exists (desktop_directory)) {
 			mkdir (desktop_directory, DEFAULT_DESKTOP_DIRECTORY_MODE);
-			/* FIXME bugzilla.eazel.com 1286: 
+			/* FIXME bugzilla.gnome.org 41286: 
 			 * How should we handle the case where this mkdir fails? 
 			 * Note that nautilus_application_startup will refuse to launch if this 
 			 * directory doesn't get created, so that case is OK. But the directory 
@@ -182,7 +182,7 @@ nautilus_get_pixmap_directory (void)
 	return g_strdup (DATADIR "/pixmaps/nautilus");
 }
 
-/* FIXME bugzilla.eazel.com 2423: 
+/* FIXME bugzilla.gnome.org 42423: 
  * Callers just use this and dereference so we core dump if
  * pixmaps are missing. That is lame.
  */
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h
index 2632163a9..669c42e0d 100644
--- a/libnautilus-private/nautilus-file-utilities.h
+++ b/libnautilus-private/nautilus-file-utilities.h
@@ -32,7 +32,7 @@ gboolean nautilus_file_name_matches_hidden_pattern   (const char *name_or_relati
 gboolean nautilus_file_name_matches_backup_pattern   (const char *name_or_relative_uri);
 gboolean nautilus_file_name_matches_metafile_pattern (const char *name_or_relative_uri);
 
-/* FIXME bugzilla.eazel.com 2424: 
+/* FIXME bugzilla.gnome.org 42424: 
  * This is the same as gnome-libs g_concat_dir_and_file except
  * for handling path == NULL.
  */
@@ -50,7 +50,7 @@ char *   nautilus_get_pixmap_directory               (void);
  * Otherwise similar to gnome_pixmap_file in that it checks to see if the file
  * exists and returns NULL if it doesn't.
  */
-/* FIXME bugzilla.eazel.com 2425: 
+/* FIXME bugzilla.gnome.org 42425: 
  * We might not need this once we get on gnome-libs 2.0 which handles
  * gnome_pixmap_file better, using GNOME_PATH.
  */
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index bd8a1ec48..5dfe534f1 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -657,7 +657,7 @@ nautilus_file_denies_access_permission (NautilusFile *file,
 	}
 
 	/* File owner's access is governed by the owner bits. */
-	/* FIXME bugzilla.eazel.com 644: 
+	/* FIXME bugzilla.gnome.org 40644: 
 	 * Can we trust the uid in the file info? Might
 	 * there be garbage there? What will it do for non-local files?
 	 */
@@ -667,7 +667,7 @@ nautilus_file_denies_access_permission (NautilusFile *file,
 
 
 	/* Group member's access is governed by the group bits. */
-	/* FIXME bugzilla.eazel.com 644: 
+	/* FIXME bugzilla.gnome.org 40644: 
 	 * Can we trust the gid in the file info? Might
 	 * there be garbage there? What will it do for non-local files?
 	 */
@@ -1147,7 +1147,7 @@ update_link (NautilusFile *link_file, NautilusFile *target_file)
 	g_assert (NAUTILUS_IS_FILE (target_file));
 	g_assert (!nautilus_file_info_missing (link_file, GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME));
 
-	/* FIXME bugzilla.eazel.com 2044: If we don't put any code
+	/* FIXME bugzilla.gnome.org 42044: If we don't put any code
 	 * here then the hash table is a waste of time.
 	 */
 }
@@ -1205,7 +1205,7 @@ update_info_internal (NautilusFile *file,
 		return FALSE;
 	}
 
-	/* FIXME bugzilla.eazel.com 2044: Need to let links that
+	/* FIXME bugzilla.gnome.org 42044: Need to let links that
 	 * point to the old name know that the file has been renamed.
 	 */
 
@@ -1309,7 +1309,7 @@ nautilus_file_set_directory (NautilusFile *file,
 
 	nautilus_file_ref (file);
 
-	/* FIXME bugzilla.eazel.com 2044: Need to let links that
+	/* FIXME bugzilla.gnome.org 42044: Need to let links that
 	 * point to the old name know that the file has been moved.
 	 */
 
@@ -2044,7 +2044,7 @@ nautilus_file_list_filter_hidden_and_backup (GList    *files,
 	GList *filtered_files;
 	GList *removed_files;
 
-	/* FIXME bugzilla.eazel.com 653: 
+	/* FIXME bugzilla.gnome.org 40653: 
 	 * Eventually this should become a generic filtering thingy. 
 	 */
 
@@ -3211,11 +3211,11 @@ gboolean
 nautilus_file_can_get_owner (NautilusFile *file)
 {
 	/* Before we have info on a file, the owner is unknown. */
-	/* FIXME bugzilla.eazel.com 644: 
+	/* FIXME bugzilla.gnome.org 40644: 
 	 * Can we trust the uid in the file info? Might
 	 * there be garbage there? What will it do for non-local files?
 	 */
-	return !nautilus_file_info_missing (file, 0 /* FIXME bugzilla.eazel.com 644: GNOME_VFS_FILE_INFO_FIELDS_UID */);
+	return !nautilus_file_info_missing (file, 0 /* FIXME bugzilla.gnome.org 40644: GNOME_VFS_FILE_INFO_FIELDS_UID */);
 }
 
 /**
@@ -3366,7 +3366,7 @@ nautilus_file_set_owner (NautilusFile *file,
 		return;
 	}
 
-	/* FIXME bugzilla.eazel.com 2427: 
+	/* FIXME bugzilla.gnome.org 42427: 
 	 * We can't assume that the gid is already good/read,
 	 * can we? Maybe we have to precede the set_file_info with a
 	 * get_file_info to fix this?
@@ -3426,11 +3426,11 @@ gboolean
 nautilus_file_can_get_group (NautilusFile *file)
 {
 	/* Before we have info on a file, the group is unknown. */
-	/* FIXME bugzilla.eazel.com 644: 
+	/* FIXME bugzilla.gnome.org 40644: 
 	 * Can we trust the gid in the file info? Might
 	 * there be garbage there? What will it do for non-local files?
 	 */
-	return !nautilus_file_info_missing (file, 0 /* FIXME bugzilla.eazel.com 644: GNOME_VFS_FILE_INFO_FIELDS_GID */);
+	return !nautilus_file_info_missing (file, 0 /* FIXME bugzilla.gnome.org 40644: GNOME_VFS_FILE_INFO_FIELDS_GID */);
 }
 
 /**
@@ -3450,11 +3450,11 @@ nautilus_file_get_group_name (NautilusFile *file)
 	struct group *group_info;
 
 	/* Before we have info on a file, the owner is unknown. */
-	if (nautilus_file_info_missing (file, 0 /* FIXME bugzilla.eazel.com 644: GNOME_VFS_FILE_INFO_FIELDS_GID */)) {
+	if (nautilus_file_info_missing (file, 0 /* FIXME bugzilla.gnome.org 40644: GNOME_VFS_FILE_INFO_FIELDS_GID */)) {
 		return NULL;
 	}
 
-	/* FIXME bugzilla.eazel.com 644: 
+	/* FIXME bugzilla.gnome.org 40644: 
 	 * Can we trust the gid in the file info? Might
 	 * there be garbage there? What will it do for non-local files?
 	 */
@@ -3669,7 +3669,7 @@ nautilus_file_set_group (NautilusFile *file,
 		return;
 	}
 
-	/* FIXME bugzilla.eazel.com 2427: We can't assume that the gid is already good/read,
+	/* FIXME bugzilla.gnome.org 42427: We can't assume that the gid is already good/read,
 	 * can we? Maybe we have to precede the set_file_info with a
 	 * get_file_info to fix this?
 	 */
@@ -3775,11 +3775,11 @@ nautilus_file_get_owner_as_string (NautilusFile *file, gboolean include_real_nam
 	char *user_name;
 
 	/* Before we have info on a file, the owner is unknown. */
-	/* FIXME bugzilla.eazel.com 644: 
+	/* FIXME bugzilla.gnome.org 40644: 
 	 * Can we trust the uid in the file info? Might
 	 * there be garbage there? What will it do for non-local files?
 	 */
-	if (nautilus_file_info_missing (file, 0 /* FIXME bugzilla.eazel.com 644: GNOME_VFS_FILE_INFO_FIELDS_UID */)) {
+	if (nautilus_file_info_missing (file, 0 /* FIXME bugzilla.gnome.org 40644: GNOME_VFS_FILE_INFO_FIELDS_UID */)) {
 		return NULL;
 	}
 
@@ -4014,7 +4014,7 @@ nautilus_file_get_deep_directory_count_as_string (NautilusFile *file)
 char *
 nautilus_file_get_string_attribute (NautilusFile *file, const char *attribute_name)
 {
-	/* FIXME bugzilla.eazel.com 646: 
+	/* FIXME bugzilla.gnome.org 40646: 
 	 * Use hash table and switch statement or function pointers for speed? 
 	 */
 
@@ -4114,7 +4114,7 @@ nautilus_file_get_string_attribute_with_default (NautilusFile *file, const char
 	}
 
 	/* Supply default values for the ones we know about. */
-	/* FIXME bugzilla.eazel.com 646: 
+	/* FIXME bugzilla.gnome.org 40646: 
 	 * Use hash table and switch statement or function pointers for speed? 
 	 */
 	if (strcmp (attribute_name, "size") == 0) {
@@ -4646,7 +4646,7 @@ nautilus_file_mark_gone (NautilusFile *file)
 		file->details->info = NULL;
 	}
 
-	/* FIXME bugzilla.eazel.com 2429: 
+	/* FIXME bugzilla.gnome.org 42429: 
 	 * Maybe we can get rid of the name too eventually, but
 	 * for now that would probably require too many if statements
 	 * everywhere anyone deals with the name. Maybe we can give it
@@ -4911,7 +4911,7 @@ nautilus_file_invalidate_attributes_internal (NautilusFile *file,
 		invalidate_activation_uri (file);
 	}
 
-	/* FIXME bugzilla.eazel.com 5075: implement invalidating metadata */
+	/* FIXME bugzilla.gnome.org 45075: implement invalidating metadata */
 }
 
 
@@ -5025,9 +5025,9 @@ nautilus_file_dump (NautilusFile *file)
 		g_print ("kind: %s \n", file_kind);
 		if (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK) {
 			g_print ("link to %s \n", file->details->info->symlink_name);
-			/* FIXME bugzilla.eazel.com 2430: add following of symlinks here */
+			/* FIXME bugzilla.gnome.org 42430: add following of symlinks here */
 		}
-		/* FIXME bugzilla.eazel.com 2431: add permissions and other useful stuff here */
+		/* FIXME bugzilla.gnome.org 42431: add permissions and other useful stuff here */
 	}
 	g_free (uri);
 }
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index c82cd5c7d..b7b034e74 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -19,7 +19,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_FILE_H
diff --git a/libnautilus-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c
index 7e6fbb552..9041efcf8 100644
--- a/libnautilus-private/nautilus-font-factory.c
+++ b/libnautilus-private/nautilus-font-factory.c
@@ -219,7 +219,7 @@ nautilus_font_factory_get_font_by_family (const char *family,
 	g_return_val_if_fail (family != NULL, NULL);
 	g_return_val_if_fail (size_in_pixels > 0, NULL);
 
-	/* FIXME bugzilla.eazel.com 7907: 
+	/* FIXME bugzilla.gnome.org 47907: 
 	 * The "GTK System Font" string is hard coded in many places.
 	 */
 	if (eel_str_is_equal (family, "GTK System Font")) {
@@ -231,7 +231,7 @@ nautilus_font_factory_get_font_by_family (const char *family,
 
 	factory = nautilus_get_current_font_factory ();
 	while (*iter) {
-		/* FIXME bugzilla.eazel.com 7347: 
+		/* FIXME bugzilla.gnome.org 47347: 
 		 * Its a hack that we check for "-" prefixes in font names.
 		 * We do this in order not to break transalted font families.
 		 */
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 20a9334a7..d605ea176 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -471,7 +471,7 @@ static const PreferenceDefault preference_defaults[] = {
 	  { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) },
 	  { USER_LEVEL_NONE }
 	},
-	/* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */
+	/* FIXME bugzilla.gnome.org 41245: Saved in pixels instead of in %? */
 	{ NAUTILUS_PREFERENCES_SIDEBAR_WIDTH,
 	  PREFERENCE_INTEGER,
 	  EEL_USER_LEVEL_NOVICE,
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index a7d22bd9f..50eb59280 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -1252,7 +1252,7 @@ emblem_layout_next (EmblemLayout *layout,
 static void
 draw_pixbuf (GdkPixbuf *pixbuf, GdkDrawable *drawable, int x, int y)
 {
-	/* FIXME bugzilla.eazel.com 703: 
+	/* FIXME bugzilla.gnome.org 40703: 
 	 * Dither would be better if we passed dither values. 
 	 */
 	gdk_pixbuf_render_to_drawable_alpha (pixbuf, drawable, 0, 0, x, y,
@@ -1280,7 +1280,7 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item)
 		temp_pixbuf = eel_create_spotlight_pixbuf (temp_pixbuf);
 		gdk_pixbuf_unref (old_pixbuf);
 
-		/* FIXME bugzilla.eazel.com 2471: This hard-wired image is inappropriate to
+		/* FIXME bugzilla.gnome.org 42471: This hard-wired image is inappropriate to
 		 * this level of code, which shouldn't know that the
 		 * preview is audio, nor should it have an icon
 		 * hard-wired in.
@@ -1777,7 +1777,7 @@ nautilus_icon_canvas_item_event (GnomeCanvasItem *item, GdkEvent *event)
 		if (!icon_item->details->is_prelit) {
 			icon_item->details->is_prelit = TRUE;
 			gnome_canvas_item_request_update (item);
-			/* FIXME bugzilla.eazel.com 2473: 
+			/* FIXME bugzilla.gnome.org 42473: 
 			 * We should emit our own signal here,
 			 * not one from the container; it could hook
 			 * up to that signal and emit one of its
@@ -1800,7 +1800,7 @@ nautilus_icon_canvas_item_event (GnomeCanvasItem *item, GdkEvent *event)
 			 * higlighted for drop. The latter gets turned on
 			 * by the drag&drop motion callback.
 			 */
-			/* FIXME bugzilla.eazel.com 2473: 
+			/* FIXME bugzilla.gnome.org 42473: 
 			 * We should emit our own signal here,
 			 * not one from the containe; it could hook up
 			 * to that signal and emit one of its
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 27d1c3fb2..3eefcadae 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.
 
    Authors: Ettore Perazzoli <ettore@gnu.org>,
-   Darin Adler <darin@eazel.com>
+   Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -522,7 +522,7 @@ keyboard_icon_reveal_timeout_callback (gpointer data)
 	 * cancel this reveal if the user manages to sneak a direct
 	 * scroll in before the timeout fires, but we later realized
 	 * this wouldn't actually be an improvement 
-	 * (see bugzilla.eazel.com 612).
+	 * (see bugzilla.gnome.org 40612).
 	 */
 	if (icon == container->details->keyboard_focus
 	    || icon->is_selected) {
@@ -599,7 +599,7 @@ get_all_icon_bounds (NautilusIconContainer *container,
 		     double *x1, double *y1,
 		     double *x2, double *y2)
 {
-	/* FIXME bugzilla.eazel.com 2477: Do we have to do something about the rubberband
+	/* FIXME bugzilla.gnome.org 42477: Do we have to do something about the rubberband
 	 * here? Any other non-icon items?
 	 */
 	gnome_canvas_item_get_bounds
@@ -1133,7 +1133,7 @@ lay_down_icons_tblr (NautilusIconContainer *container, GList *icons)
 	/* These modes are special. We freeze all of our positions
 	 * after we do the layout.
 	 */
-	/* FIXME bugzilla.eazel.com 2478: 
+	/* FIXME bugzilla.gnome.org 42478: 
 	 * This should not be tied to the direction of layout.
 	 * It should be a separate switch.
 	 */
@@ -1152,7 +1152,7 @@ lay_down_icons (NautilusIconContainer *container, GList *icons, double start_y)
 		
 	case NAUTILUS_ICON_LAYOUT_T_B_L_R:
 	case NAUTILUS_ICON_LAYOUT_T_B_R_L:
-		/* FIXME bugzilla.eazel.com 2479: 
+		/* FIXME bugzilla.gnome.org 42479: 
 		 * Need to handle T_B_R_L differently. */
 		lay_down_icons_tblr (container, icons);
 		break;
@@ -1367,7 +1367,7 @@ nautilus_icon_container_move_icon (NautilusIconContainer *container,
 		icon_raise (icon);
 	}
 
-	/* FIXME bugzilla.eazel.com 2474: 
+	/* FIXME bugzilla.gnome.org 42474: 
 	 * Handling of the scroll region is inconsistent here. In
 	 * the scale-changing case, redo_layout is called, which updates the
 	 * scroll region appropriately. In other cases, it's up to the
@@ -2366,7 +2366,7 @@ size_allocate (GtkWidget *widget,
 
 	need_layout_redone = !container->details->has_been_allocated;
 
-	/* FIXME bugzilla.eazel.com 7219: 
+	/* FIXME bugzilla.gnome.org 47219: 
 	 * We shouldn't have to redo the layout when x, y, or height
 	 * changes, only when width changes. However, just removing these
 	 * tests causes a problem when you're vertically stretching a window
@@ -3334,8 +3334,8 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
         details->zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD;
  
  	/* font table - this isn't exactly proportional, but it looks better than computed */
-	/* FIXME bugzilla.eazel.com 5093: Font name is hard-coded here. */
-	/* FIXME bugzilla.eazel.com 5101: Font size is hard-coded here. */
+	/* FIXME bugzilla.gnome.org 45093: Font name is hard-coded here. */
+	/* FIXME bugzilla.gnome.org 45101: Font size is hard-coded here. */
 
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLEST] = nautilus_font_factory_get_font_by_family ("helvetica", 8);
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLER] = nautilus_font_factory_get_font_by_family ("helvetica", 8);
@@ -3936,7 +3936,7 @@ nautilus_icon_container_add (NautilusIconContainer *container,
 
 	details = container->details;
 
-	/* FIXME bugzilla.eazel.com 1288: 
+	/* FIXME bugzilla.gnome.org 41288: 
 	 * I guess we need to use an indexed data structure to avoid this loop.
 	 */
 	for (p = details->icons; p != NULL; p = p->next) {
@@ -3989,7 +3989,7 @@ nautilus_icon_container_remove (NautilusIconContainer *container,
 
 	end_renaming_mode (container, FALSE);
 		
-	/* FIXME bugzilla.eazel.com 1288: 
+	/* FIXME bugzilla.gnome.org 41288: 
 	 * I guess we need to use an indexed data structure to avoid this loop.
 	 */
 	for (p = container->details->icons; p != NULL; p = p->next) {
@@ -4103,7 +4103,7 @@ nautilus_icon_container_reveal (NautilusIconContainer *container, NautilusIconDa
 	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
 	g_return_if_fail (data != NULL);
 
-	/* FIXME bugzilla.eazel.com 1288: 
+	/* FIXME bugzilla.gnome.org 41288: 
 	 * I guess we need to use an indexed data structure to avoid this loop.
 	 */
 	for (p = container->details->icons; p != NULL; p = p->next) {
@@ -4545,7 +4545,7 @@ compute_stretch (StretchState *start,
 	gboolean right, bottom;
 	int x_stretch, y_stretch;
 
-	/* FIXME bugzilla.eazel.com 5390: This doesn't correspond to
+	/* FIXME bugzilla.gnome.org 45390: This doesn't correspond to
          * the way the handles are drawn.
 	 */
 	/* Figure out which handle we are dragging. */
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index 30382a19e..77748c6d6 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -20,7 +20,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 
-   Authors: Ettore Perazzoli <ettore@gnu.org>, Darin Adler <darin@eazel.com>
+   Authors: Ettore Perazzoli <ettore@gnu.org>, Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_ICON_CONTAINER_H
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 5af3195e5..e94d76452 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.
 
    Authors: Ettore Perazzoli <ettore@gnu.org>,
-            Darin Adler <darin@eazel.com>,
+            Darin Adler <darin@bentspoon.com>,
 	    Andy Hertzfeld <andy@eazel.com>
 	    Pavel Cisler <pavel@eazel.com>
 */
@@ -363,7 +363,7 @@ nautilus_icon_container_dropped_icon_feedback (GtkWidget *widget,
 
 	/* Delete old shadow if any. */
 	if (dnd_info->shadow != NULL) {
-		/* FIXME bugzilla.eazel.com 2484: 
+		/* FIXME bugzilla.gnome.org 42484: 
 		 * Is a destroy really sufficient here? Who does the unref? */
 		gtk_object_destroy (GTK_OBJECT (dnd_info->shadow));
 	}
@@ -488,7 +488,7 @@ drag_data_received_callback (GtkWidget *widget,
 
 }
 
-/* FIXME bugzilla.eazel.com 7445: Needs to become a shared function */
+/* FIXME bugzilla.gnome.org 47445: Needs to become a shared function */
 static void
 get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context, guint32 time)
 {
@@ -642,7 +642,7 @@ receive_dropped_keyword (NautilusIconContainer *container, char* keyword, int x,
 		return;
 	}
 
-	/* FIXME bugzilla.eazel.com 2485: 
+	/* FIXME bugzilla.gnome.org 42485: 
 	 * This does not belong in the icon code.
 	 * It has to be in the file manager.
 	 * The icon code has no right to deal with the file directly.
@@ -761,7 +761,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 	const char *message;
 	GnomeDialog *dialog;
 
-	/* FIXME bugzilla.eazel.com 915: Use of the word "directory"
+	/* FIXME bugzilla.gnome.org 40915: Use of the word "directory"
 	 * makes this FMIconView specific. Move these messages into
 	 * FMIconView so NautilusIconContainer can be used for things
 	 * that are not directories?
@@ -903,7 +903,7 @@ nautilus_icon_container_find_drop_target (NautilusIconContainer *container,
   	gnome_canvas_window_to_world (GNOME_CANVAS (container),
 				      x, y, &world_x, &world_y);
 	
-	/* FIXME bugzilla.eazel.com 2485: 
+	/* FIXME bugzilla.gnome.org 42485: 
 	 * These "can_accept_items" tests need to be done by
 	 * the icon view, not here. This file is not supposed to know
 	 * that the target is a file.
@@ -938,7 +938,7 @@ nautilus_icon_container_find_drop_target (NautilusIconContainer *container,
 	return nautilus_icon_container_get_icon_drop_target_uri (container, drop_target_icon);
 }
 
-/* FIXME bugzilla.eazel.com 2485: This belongs in FMDirectoryView, not here. */
+/* FIXME bugzilla.gnome.org 42485: This belongs in FMDirectoryView, not here. */
 static gboolean
 selection_includes_special_link (GList *selection_list)
 {
@@ -951,7 +951,7 @@ selection_includes_special_link (GList *selection_list)
 	for (node = selection_list; node != NULL; node = node->next) {
 		uri = ((EelDragSelectionItem *) node->data)->uri;
 
-		/* 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. */
 		local_path = gnome_vfs_get_local_path_from_uri (uri);
 		link_in_selection = local_path != NULL
 			&& (nautilus_link_local_is_trash_link (local_path) || nautilus_link_local_is_home_link (local_path) ||
@@ -984,7 +984,7 @@ nautilus_icon_container_receive_dropped_icons (NautilusIconContainer *container,
 	}
 
 	if (context->action == GDK_ACTION_ASK) {
-		/* FIXME bugzilla.eazel.com 2485: This belongs in FMDirectoryView, not here. */
+		/* FIXME bugzilla.gnome.org 42485: This belongs in FMDirectoryView, not here. */
 		/* Check for special case items in selection list */
 		if (selection_includes_special_link (container->details->dnd_info->drag_info.selection_list)) {
 			/* We only want to move the trash */
@@ -1145,7 +1145,7 @@ nautilus_icon_dnd_update_drop_target (NautilusIconContainer *container,
 	/* Find the item we hit with our drop, if any. */
 	icon = nautilus_icon_container_item_at (container, world_x, world_y);
 
-	/* FIXME bugzilla.eazel.com 2485: 
+	/* FIXME bugzilla.gnome.org 42485: 
 	 * These "can_accept_items" tests need to be done by
 	 * the icon view, not here. This file is not supposed to know
 	 * that the target is a file.
@@ -1250,7 +1250,7 @@ nautilus_icon_dnd_fini (NautilusIconContainer *container)
 
 	stop_auto_scroll (container);
 	if (container->details->dnd_info->shadow != NULL) {
-		/* FIXME bugzilla.eazel.com 2484: 
+		/* FIXME bugzilla.gnome.org 42484: 
 		 * Is a destroy really sufficient here? Who does the unref? */
 		gtk_object_destroy (GTK_OBJECT (container->details->dnd_info->shadow));
 	}
diff --git a/libnautilus-private/nautilus-icon-dnd.h b/libnautilus-private/nautilus-icon-dnd.h
index 5dd83cc44..09efebcd2 100644
--- a/libnautilus-private/nautilus-icon-dnd.h
+++ b/libnautilus-private/nautilus-icon-dnd.h
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.
 
    Authors: Ettore Perazzoli <ettore@gnu.org>,
-            Darin Adler <darin@eazel.com>,
+            Darin Adler <darin@bentspoon.com>,
 	    Andy Hertzfeld <andy@eazel.com>
 */
 
diff --git a/libnautilus-private/nautilus-icon-factory-private.h b/libnautilus-private/nautilus-icon-factory-private.h
index 5abb222c6..1dd8fd716 100644
--- a/libnautilus-private/nautilus-icon-factory-private.h
+++ b/libnautilus-private/nautilus-icon-factory-private.h
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_ICON_FACTORY_PRIVATE_H
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index bc7276655..64c25c6a2 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.
   
    Authors: John Sullivan <sullivan@eazel.com>,
-            Darin Adler <darin@eazel.com>,
+            Darin Adler <darin@bentspoon.com>,
 	    Andy Hertzfeld <andy@eazel.com>
 */
 
@@ -111,7 +111,7 @@ static const char *icon_file_name_suffixes[] =
 /* Images are used themselves as thumbnails when they are below this
  * threshold size.
  */
-/* FIXME bugzilla.eazel.com 5081: Later we might have to have a more
+/* FIXME bugzilla.gnome.org 45081: Later we might have to have a more
  * complex rule about when to use an image for itself.
  */
 #define SELF_THUMBNAIL_SIZE_THRESHOLD   16384
@@ -1541,12 +1541,12 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 	
 	/* Handle nautilus link xml files, which may specify their own image */	
 	if (nautilus_file_is_nautilus_link (file)) {
-		/* FIXME bugzilla.eazel.com 2563: This does sync. I/O and only works for local paths. */
+		/* FIXME bugzilla.gnome.org 42563: This does sync. I/O and only works for local paths. */
 		file_path = gnome_vfs_get_local_path_from_uri (file_uri);
 		if (file_path != NULL) {
 			image_uri = nautilus_link_local_get_image_uri (file_path);
 			if (image_uri != NULL) {
-				/* FIXME bugzilla.eazel.com 2564: All custom icons must be in file:. */
+				/* FIXME bugzilla.gnome.org 42564: All custom icons must be in file:. */
 				icon_path = gnome_vfs_get_local_path_from_uri (image_uri);
 				if (icon_path == NULL && image_uri[0] == '/') {
 					icon_path = g_strdup (image_uri);
@@ -1568,7 +1568,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 	/* Handle .desktop files. */
 	if (uri == NULL
 	    && nautilus_file_is_mime_type (file, "application/x-gnome-app-info")) {
-		/* FIXME bugzilla.eazel.com 2563: This does sync. I/O and only works for local paths. */
+		/* FIXME bugzilla.gnome.org 42563: This does sync. I/O and only works for local paths. */
 		file_path = gnome_vfs_get_local_path_from_uri (file_uri);
 		if (file_path != NULL) {
 			entry = gnome_desktop_entry_load (file_path);
@@ -1851,7 +1851,7 @@ get_cache_time (const char *file_uri, time_t *cache_time)
 		return GNOME_VFS_ERROR_NOT_SUPPORTED;
 	}
 		
-	/* FIXME bugzilla.eazel.com 2566: if the URI is remote, assume
+	/* FIXME bugzilla.gnome.org 42566: if the URI is remote, assume
 	 * it's valid to match logic below.
 	 */
 	vfs_uri = gnome_vfs_uri_new (file_uri);
diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c
index af72de11d..ac8940d35 100644
--- a/libnautilus-private/nautilus-icon-text-item.c
+++ b/libnautilus-private/nautilus-icon-text-item.c
@@ -1090,7 +1090,7 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event)
 		return TRUE;
 
 	case GDK_FOCUS_CHANGE:
-		/* FIXME bugzilla.eazel.com 5484:
+		/* FIXME bugzilla.gnome.org 45484:
 		 * Working around bug in the GnomeCanvas widget's focus_in/focus_out
 		 * methods. They (all widgets) should be setting/usetting these flags.
 		 * GnomeCanvas doesn't. We need it set so the GtkWindow passes us all
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.c b/libnautilus-private/nautilus-lib-self-check-functions.c
index 50156c1c0..2451016e4 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.c
+++ b/libnautilus-private/nautilus-lib-self-check-functions.c
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.h b/libnautilus-private/nautilus-lib-self-check-functions.h
index 7bbdfce48..3935595b1 100644
--- a/libnautilus-private/nautilus-lib-self-check-functions.h
+++ b/libnautilus-private/nautilus-lib-self-check-functions.h
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <eel/eel-self-checks.h>
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index c2b52637c..4f2bf0ad3 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -468,7 +468,7 @@ nautilus_link_local_get_link_type (const char *path)
 	return type;
 }
 
-/* FIXME bugzilla.eazel.com 2495: 
+/* FIXME bugzilla.gnome.org 42495: 
  * Caller has to know to pass in a file with a NUL character at the end.
  */
 char *
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c
index b7bb83cdb..5cff8e9b0 100644
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
@@ -505,7 +505,7 @@ merged_add_real_directory (NautilusMergedDirectory *merged,
 			    done_loading_callback,
 			    merged);
 
-	/* FIXME bugzilla.eazel.com 5084: The done_loading part won't work for the case where
+	/* FIXME bugzilla.gnome.org 45084: The done_loading part won't work for the case where
          * we have no directories in our list.
 	 */
 
@@ -513,7 +513,7 @@ merged_add_real_directory (NautilusMergedDirectory *merged,
 	g_hash_table_foreach (merged->details->monitors,
 			      monitor_add_directory,
 			      real_directory);
-	/* FIXME bugzilla.eazel.com 2541: Do we need to add the directory to callbacks too? */
+	/* FIXME bugzilla.gnome.org 42541: Do we need to add the directory to callbacks too? */
 
 	gtk_signal_connect (GTK_OBJECT (real_directory),
 			    "files_added",
diff --git a/libnautilus-private/nautilus-merged-directory.h b/libnautilus-private/nautilus-merged-directory.h
index ac8db0bd5..fd0429712 100644
--- a/libnautilus-private/nautilus-merged-directory.h
+++ b/libnautilus-private/nautilus-merged-directory.h
@@ -21,7 +21,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_MERGED_DIRECTORY_H
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index 9d8b6825d..e5bfed42d 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -656,7 +656,7 @@ find_monitor_node (GList *monitors, const Nautilus_MetafileMonitor monitor)
 		}
 	}
 	
-	/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+	/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 
 	CORBA_exception_free (&ev);
 	
@@ -711,7 +711,7 @@ nautilus_metafile_notify_metafile_ready (NautilusMetafile *metafile)
 	for (node = metafile->details->monitors; node != NULL; node = node->next) {
 		monitor = node->data;
 		Nautilus_MetafileMonitor_metafile_ready (monitor, &ev);
-		/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+		/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	}
 	
 	CORBA_exception_free (&ev);
@@ -730,7 +730,7 @@ call_metafile_changed (NautilusMetafile *metafile,
 	for (node = metafile->details->monitors; node != NULL; node = node->next) {
 		monitor = node->data;
 		Nautilus_MetafileMonitor_metafile_changed (monitor, file_names, &ev);
-		/* FIXME bugzilla.eazel.com 6664: examine ev for errors */
+		/* FIXME bugzilla.gnome.org 46664: examine ev for errors */
 	}
 	
 	CORBA_exception_free (&ev);
@@ -1530,7 +1530,7 @@ copy_file_metadata (NautilusMetafile *source_metafile,
 	g_return_if_fail (NAUTILUS_IS_METAFILE (destination_metafile));
 	g_return_if_fail (destination_file_name != NULL);
 
-	/* FIXME bugzilla.eazel.com 3343: This does not properly
+	/* FIXME bugzilla.gnome.org 43343: This does not properly
 	 * handle the case where we don't have the source metadata yet
 	 * since it's not read in.
 	 */
@@ -1549,7 +1549,7 @@ copy_file_metadata (NautilusMetafile *source_metafile,
 			g_hash_table_insert (destination_metafile->details->node_hash,
 					     xmlMemStrdup (destination_file_name), node);
 		} else {
-			/* FIXME bugzilla.eazel.com 6526: Copying data into a destination
+			/* FIXME bugzilla.gnome.org 46526: Copying data into a destination
 			 * where the metafile was not yet read is not implemented.
 			 */
 			g_warning ("not copying metadata");
@@ -1896,7 +1896,7 @@ allow_metafile (NautilusMetafile *metafile)
 	 * hardcode the schemes that are good for metadata instead of
 	 * the schemes that are bad for it.
 	 */
-	/* FIXME bugzilla.eazel.com 2434: 
+	/* FIXME bugzilla.gnome.org 42434: 
 	 * We need to handle this in a better way. Perhaps a
 	 * better way can wait until we have support for metadata
 	 * access inside gnome-vfs.
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index dc2cfda09..28bc9e44f 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -218,7 +218,7 @@ nautilus_mime_get_default_application_for_file_internal (NautilusFile *file,
 	default_application_string = nautilus_file_get_metadata 
 		(file, NAUTILUS_METADATA_KEY_DEFAULT_APPLICATION, NULL);
 
-	/* FIXME bugzilla.eazel.com 5085: should fall back to normal default 
+	/* FIXME bugzilla.gnome.org 45085: should fall back to normal default 
 	   if user-specified default is bogus */
 
 	if (default_application_string == NULL) {
@@ -940,7 +940,7 @@ nautilus_mime_set_short_list_applications_for_file (NautilusFile      *file,
 		 NAUTILUS_METADATA_SUBKEY_APPLICATION_ID,
 		 remove_list);
 
-	/* FIXME bugzilla.eazel.com 1269: 
+	/* FIXME bugzilla.gnome.org 41269: 
 	 * need to free normal_short_list, normal_short_list_ids, add_list, remove_list 
 	 */
 
@@ -987,7 +987,7 @@ nautilus_mime_set_short_list_components_for_file (NautilusFile      *file,
 		 NAUTILUS_METADATA_SUBKEY_COMPONENT_IID,
 		 remove_list);
 
-	/* FIXME bugzilla.eazel.com 1269: 
+	/* FIXME bugzilla.gnome.org 41269: 
 	 * need to free normal_short_list, normal_short_list_ids, add_list, remove_list 
 	 */
 
@@ -1320,7 +1320,7 @@ make_oaf_query_with_known_mime_type (const char *mime_type,
 
 		 /* One of two possibilties */
 
-		 /* FIXME bugzilla.eazel.com 2542: this comment is not very clear. */
+		 /* FIXME bugzilla.gnome.org 42542: this comment is not very clear. */
 		 /* 1 The mime type and URI scheme match the supported
                     attributes. */
 
@@ -1414,7 +1414,7 @@ make_oaf_query_with_uri_scheme_only (const char *uri_scheme,
                    */
                   "AND (NOT bonobo:supported_mime_types.defined ()))"
 
-		  /* FIXME bugzilla.eazel.com 2542: improve the comment explaining this. */
+		  /* FIXME bugzilla.gnome.org 42542: improve the comment explaining this. */
 		  
 		  /* This attribute allows uri schemes to be supported
 		     even for unsupported mime types or no mime type. */
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index b08be54e8..a0155838a 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.
   
    Authors: Seth Nickell <seth@eazel.com>
-            Darin Adler <darin@eazel.com>
+            Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-monitor.h b/libnautilus-private/nautilus-monitor.h
index 35d990323..dfb4b0951 100644
--- a/libnautilus-private/nautilus-monitor.h
+++ b/libnautilus-private/nautilus-monitor.h
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.
   
    Authors: Seth Nickell <seth@eazel.com>
-            Darin Adler <darin@eazel.com>
+            Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_MONITOR_H
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index 71895d14c..00022dcfd 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -112,7 +112,7 @@ program_file_pair_compute_status (ProgramFilePair *pair)
 {
 	ProgramFileStatus new_status;
 
-	/* FIXME bugzilla.eazel.com 1459: Need to check whether it's the default or in short list for the supertype */
+	/* FIXME bugzilla.gnome.org 41459: Need to check whether it's the default or in short list for the supertype */
 	if (program_file_pair_is_default_for_file_type (pair)) {
 		new_status = PROGRAM_DEFAULT_FOR_TYPE;
 	} else if (program_file_pair_is_default_for_file (pair)) {
@@ -203,7 +203,7 @@ program_file_pair_get_program_name_for_display (ProgramFilePair *pair)
 static char *
 get_supertype_from_file (NautilusFile *file)
 {
-	/* FIXME bugzilla.eazel.com 1459: Needs implementation */
+	/* FIXME bugzilla.gnome.org 41459: Needs implementation */
 	return nautilus_file_get_string_attribute (file, "type");
 }
 
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index c4c9e22b8..674477eba 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -604,7 +604,7 @@ get_xalf_prefix (const char *name)
 	char *quoted;
 	char *prefix;
 
-	/* FIXME bugzilla.eazel.com 8206: At time I am writing this,
+	/* FIXME bugzilla.gnome.org 48206: At time I am writing this,
 	 * xalf is still pretty buggy, and Nautilus uses it a lot more
 	 * than the Panel does with no way to turn it off for
 	 * individual programs the way you can in the Panel. Sadly,
diff --git a/libnautilus-private/nautilus-search-uri.c b/libnautilus-private/nautilus-search-uri.c
index f3c0872c8..67337b2ac 100644
--- a/libnautilus-private/nautilus-search-uri.c
+++ b/libnautilus-private/nautilus-search-uri.c
@@ -701,15 +701,15 @@ nautilus_self_check_search_uri (void)
                                       _("Items containing \"stuff\" in their names"));
         EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_type is file"), 
                                       _("Items that are regular files"));
-        /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
+        /* FIXME bugzilla.gnome.org 45088: This may be what the function calls "human", but it's bad grammar. */
         EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"), 
                                       _("Items containing \"stuff\" in their names and that are regular files"));
-        /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
+        /* FIXME bugzilla.gnome.org 45088: This may be what the function calls "human", but it's bad grammar. */
         EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains stuff & file_type is file"
                                                                     " & size smaller_than 2000"), 
                                       _("Items containing \"stuff\" in their names, that are regular files and "
                                         "smaller than 2000 bytes"));
-        /* FIXME bugzilla.eazel.com 5088: This may be what the function calls "human", but it's bad grammar. */
+        /* FIXME bugzilla.gnome.org 45088: This may be what the function calls "human", but it's bad grammar. */
         EEL_CHECK_STRING_RESULT (nautilus_search_uri_to_human ("search:[][]file_name contains medusa & file_type is directory"), 
                                       _("Items containing \"medusa\" in their names and that are "
                                         "folders"));
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index 58cd06cce..f7f69134c 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -74,7 +74,7 @@ vfs_file_exists (const char *file_uri)
 		return FALSE;
 	}	
 
-	/* FIXME bugzilla.eazel.com 3137: The synchronous I/O here
+	/* FIXME bugzilla.gnome.org 43137: The synchronous I/O here
 	 * means this call is unsuitable for use on anything that
 	 * might be remote.
 	 */
@@ -193,7 +193,7 @@ make_thumbnail_uri (const char *image_uri, gboolean directory_only, gboolean use
 				return NULL;
 			}
 		}
-		/* FIXME bugzilla.eazel.com 3137: synchronous I/O - it
+		/* FIXME bugzilla.gnome.org 43137: synchronous I/O - it
                    looks like the URI will be local-only, but best to
                    make sure. */
 
@@ -220,7 +220,7 @@ make_thumbnail_uri (const char *image_uri, gboolean directory_only, gboolean use
 }
 
 /* utility routine that takes two uris and returns true if the first file has been modified later than the second */
-/* FIXME bugzilla.eazel.com 2565: it makes synchronous file info calls, so for now, it returns FALSE if either of the uri's are non-local */
+/* FIXME bugzilla.gnome.org 42565: it makes synchronous file info calls, so for now, it returns FALSE if either of the uri's are non-local */
 static gboolean
 first_file_more_recent (const char* file_uri, const char* other_file_uri)
 {
@@ -310,7 +310,7 @@ nautilus_thumbnail_has_invalid_thumbnail (NautilusFile *file)
 
 /* routine that takes a uri of a large image file and returns the uri of its corresponding thumbnail.
    If no thumbnail is available, put the image on the thumbnail queue so one is eventually made. */
-/* FIXME bugzilla.eazel.com 642: 
+/* FIXME bugzilla.gnome.org 40642: 
  * Most of this thumbnail machinery belongs in NautilusFile, not here.
  */
 
@@ -380,7 +380,7 @@ nautilus_get_thumbnail_uri (NautilusFile *file)
 	local_flag = TRUE;
 	thumbnail_uri = make_thumbnail_uri (file_uri, TRUE, local_flag, TRUE);
 				
-	/* FIXME bugzilla.eazel.com 3137: more potentially losing
+	/* FIXME bugzilla.gnome.org 43137: more potentially losing
 	   synch I/O - this could be remote */
 
 	result = gnome_vfs_make_directory (thumbnail_uri, THUMBNAIL_DIR_PERMISSIONS);
diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c
index 4c3e827d1..95297faff 100644
--- a/libnautilus-private/nautilus-trash-directory.c
+++ b/libnautilus-private/nautilus-trash-directory.c
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-trash-directory.h b/libnautilus-private/nautilus-trash-directory.h
index ffa0f7cc5..10da34187 100644
--- a/libnautilus-private/nautilus-trash-directory.h
+++ b/libnautilus-private/nautilus-trash-directory.h
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_TRASH_DIRECTORY_H
diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c
index 62173deed..b51849bb9 100644
--- a/libnautilus-private/nautilus-trash-file.c
+++ b/libnautilus-private/nautilus-trash-file.c
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-trash-file.h b/libnautilus-private/nautilus-trash-file.h
index 0ee86a88f..19b495fee 100644
--- a/libnautilus-private/nautilus-trash-file.h
+++ b/libnautilus-private/nautilus-trash-file.h
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_TRASH_FILE_H
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c
index 2d55ae555..6cd4ab129 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.c
+++ b/libnautilus-private/nautilus-undo-signal-handlers.c
@@ -288,7 +288,7 @@ restore_editable_from_undo_snapshot_callback (GtkObject *target, gpointer callba
  * Both here and in nautilus-shell-ui.xml.
  */
 
-/* FIXME bugzilla.eazel.com 3515: Undo doesn't work */
+/* FIXME bugzilla.gnome.org 43515: Undo doesn't work */
 #ifdef UNDO_ENABLED
 
 static gboolean
@@ -323,7 +323,7 @@ editable_key_press_event (GtkEditable *editable, GdkEventKey *event, gpointer us
 void 
 nautilus_undo_editable_set_undo_key (GtkEditable *editable, gboolean value)
 {
-/* FIXME bugzilla.eazel.com 3515: Undo doesn't work */
+/* FIXME bugzilla.gnome.org 43515: Undo doesn't work */
 #ifdef UNDO_ENABLED
 	if (value) {
 		/* Connect to entry signals */
@@ -332,7 +332,7 @@ nautilus_undo_editable_set_undo_key (GtkEditable *editable, gboolean value)
 				    GTK_SIGNAL_FUNC (editable_key_press_event),
 				    NULL);
 	} else {
-		/* FIXME bugzilla.eazel.com 5092: Warns if the handler
+		/* FIXME bugzilla.gnome.org 45092: Warns if the handler
 		 * is not already connected. We could use object data
 		 * to prevent that little problem.
 		 */
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/libnautilus-private/nautilus-vfs-directory.c
index 66b3fffca..e8446a8d2 100644
--- a/libnautilus-private/nautilus-vfs-directory.c
+++ b/libnautilus-private/nautilus-vfs-directory.c
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-vfs-directory.h b/libnautilus-private/nautilus-vfs-directory.h
index 922b768bb..059ff6524 100644
--- a/libnautilus-private/nautilus-vfs-directory.h
+++ b/libnautilus-private/nautilus-vfs-directory.h
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_VFS_DIRECTORY_H
diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c
index 3036cbc15..0a0e42e36 100644
--- a/libnautilus-private/nautilus-vfs-file.c
+++ b/libnautilus-private/nautilus-vfs-file.c
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #include <config.h>
diff --git a/libnautilus-private/nautilus-vfs-file.h b/libnautilus-private/nautilus-vfs-file.h
index 377b6d1b4..2b1ee607e 100644
--- a/libnautilus-private/nautilus-vfs-file.h
+++ b/libnautilus-private/nautilus-vfs-file.h
@@ -20,7 +20,7 @@
    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
   
-   Author: Darin Adler <darin@eazel.com>
+   Author: Darin Adler <darin@bentspoon.com>
 */
 
 #ifndef NAUTILUS_VFS_FILE_H
diff --git a/libnautilus/nautilus-bonobo-workarounds.c b/libnautilus/nautilus-bonobo-workarounds.c
index 9537cdc5e..082ab6b4e 100644
--- a/libnautilus/nautilus-bonobo-workarounds.c
+++ b/libnautilus/nautilus-bonobo-workarounds.c
@@ -19,7 +19,7 @@
  *  License along with this library; 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>
  *
  */
 
@@ -56,7 +56,7 @@ typedef struct {
  */
 #define MINIMIZE_RACE_CONDITIONS_DELAY 60000
 
-/* FIXME bugzilla.eazel.com 2456: Is a hard-coded 20 seconds wait to
+/* FIXME bugzilla.gnome.org 42456: Is a hard-coded 20 seconds wait to
  * detect that a remote object's process is hung acceptable? Can a
  * component that is working still take 20 seconds to respond?
  */
diff --git a/libnautilus/nautilus-bonobo-workarounds.h b/libnautilus/nautilus-bonobo-workarounds.h
index ce3209fe6..bbdc55fbf 100644
--- a/libnautilus/nautilus-bonobo-workarounds.h
+++ b/libnautilus/nautilus-bonobo-workarounds.h
@@ -19,7 +19,7 @@
  *  License along with this library; 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/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c
index d13682281..dd29ebdce 100644
--- a/libnautilus/nautilus-clipboard.c
+++ b/libnautilus/nautilus-clipboard.c
@@ -24,7 +24,7 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors: Rebecca Schulman <rebecka@eazel.com>,
- *          Darin Adler <darin@eazel.com>
+ *          Darin Adler <darin@bentspoon.com>
  */
 
 #include <config.h>
diff --git a/libnautilus/nautilus-distributed-undo.idl b/libnautilus/nautilus-distributed-undo.idl
index 397306037..5a68056e0 100644
--- a/libnautilus/nautilus-distributed-undo.idl
+++ b/libnautilus/nautilus-distributed-undo.idl
@@ -82,7 +82,7 @@ module Nautilus {
 			 */
 			void undo ();
 
-			/* FIXME bugzilla.eazel.com 1292: 
+			/* FIXME bugzilla.gnome.org 41292: 
 			 * We may need additional interface so the
 			 * client can include an appropriate undo item in
 			 * a contextual menu.
diff --git a/libnautilus/nautilus-idle-queue.c b/libnautilus/nautilus-idle-queue.c
index 5d9e9d3cd..386a1c457 100644
--- a/libnautilus/nautilus-idle-queue.c
+++ b/libnautilus/nautilus-idle-queue.c
@@ -19,7 +19,7 @@
  *  License along with this library; 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/libnautilus/nautilus-idle-queue.h b/libnautilus/nautilus-idle-queue.h
index d797b6cb7..5f95f3a0f 100644
--- a/libnautilus/nautilus-idle-queue.h
+++ b/libnautilus/nautilus-idle-queue.h
@@ -19,7 +19,7 @@
  *  License along with this library; 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/libnautilus/nautilus-undo.c b/libnautilus/nautilus-undo.c
index 0948f8b41..b7a05c4ad 100644
--- a/libnautilus/nautilus-undo.c
+++ b/libnautilus/nautilus-undo.c
@@ -20,7 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Darin Adler <darin@eazel.com>
+ * Author: Darin Adler <darin@bentspoon.com>
  */
 
 #include <config.h>
diff --git a/libnautilus/nautilus-undo.h b/libnautilus/nautilus-undo.h
index 76f684a8d..a2a830023 100644
--- a/libnautilus/nautilus-undo.h
+++ b/libnautilus/nautilus-undo.h
@@ -20,7 +20,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Darin Adler <darin@eazel.com>
+ * Author: Darin Adler <darin@bentspoon.com>
  */
 
 #ifndef NAUTILUS_UNDO_H
diff --git a/libnautilus/nautilus-view-component.idl b/libnautilus/nautilus-view-component.idl
index 89173ab20..9becf75a0 100644
--- a/libnautilus/nautilus-view-component.idl
+++ b/libnautilus/nautilus-view-component.idl
@@ -21,7 +21,7 @@
  *  Software 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/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 4e7b9a1c5..1eaf42ed9 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.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/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h
index 05ce52fc5..d16168b5b 100644
--- a/libnautilus/nautilus-view.h
+++ b/libnautilus/nautilus-view.h
@@ -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/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 */