Update the copyrights, replacing Helix Code with Ximian and

helixcode.com with ximian.com all over the place.

svn path=/trunk/; revision=10440

56 files changed, 64 insertions, 64 deletions

diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 2106432a78..693b7bf812 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-component-registry.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index da39d948ac..1da20879ef 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-component-registry.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c
index e25907df68..78dcf6234b 100644
--- a/shell/e-corba-storage-registry.c
+++ b/shell/e-corba-storage-registry.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-corba-storage-registry.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-corba-storage-registry.h b/shell/e-corba-storage-registry.h
index 20aedbff4b..66a9974627 100644
--- a/shell/e-corba-storage-registry.h
+++ b/shell/e-corba-storage-registry.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-corba-storage-registry.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-corba-storage.h b/shell/e-corba-storage.h
index 01e5f5b8d4..8199ee3450 100644
--- a/shell/e-corba-storage.h
+++ b/shell/e-corba-storage.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-corba-storage.h
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-folder-tree.h b/shell/e-folder-tree.h
index 46773c139b..8f3f7fe31e 100644
--- a/shell/e-folder-tree.h
+++ b/shell/e-folder-tree.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-folder-tree.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-folder-type-registry.h b/shell/e-folder-type-registry.h
index f34db31811..46d7f41442 100644
--- a/shell/e-folder-type-registry.h
+++ b/shell/e-folder-type-registry.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-folder-type-registry.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-folder.c b/shell/e-folder.c
index 0ea68d55ec..86d2cf90f7 100644
--- a/shell/e-folder.c
+++ b/shell/e-folder.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-folder.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-folder.h b/shell/e-folder.h
index 81bbd54448..2eee4dad26 100644
--- a/shell/e-folder.h
+++ b/shell/e-folder.h
@@ -1,7 +1,7 @@
  /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-folder.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c
index 21f6e6e1d8..41fe1a4150 100644
--- a/shell/e-local-folder.c
+++ b/shell/e-local-folder.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-local-folder.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-setup.h b/shell/e-setup.h
index a69d216b94..ba7bac5840 100644
--- a/shell/e-setup.h
+++ b/shell/e-setup.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-setup.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h
index 70986144d0..02744c0b9b 100644
--- a/shell/e-shell-constants.h
+++ b/shell/e-shell-constants.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-utils.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-folder-creation-dialog.h b/shell/e-shell-folder-creation-dialog.h
index 63b6b1179a..b9c1b6b979 100644
--- a/shell/e-shell-folder-creation-dialog.h
+++ b/shell/e-shell-folder-creation-dialog.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-folder-selection-dialog.h b/shell/e-shell-folder-selection-dialog.h
index 8aed7197dd..cf0de808d2 100644
--- a/shell/e-shell-folder-selection-dialog.h
+++ b/shell/e-shell-folder-selection-dialog.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-folder-selection-dialog.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h
index 092a465f14..f3a8e0c110 100644
--- a/shell/e-shell-folder-title-bar.h
+++ b/shell/e-shell-folder-title-bar.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-folder-title-bar.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 2a16fc522c..6fe27e8fdf 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* importer.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Iain Holmes  <iain@helixcode.com>
+ * Author: Iain Holmes  <iain@ximian.com>
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h
index 644ff62866..37a5f6ce9e 100644
--- a/shell/e-shell-importer.h
+++ b/shell/e-shell-importer.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* importer.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Iain Holmes  <iain@helixcode.com>
+ * Author: Iain Holmes  <iain@ximian.com>
  */
 
 #include <bonobo/bonobo-ui-component.h>
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index e0b12f42f8..f5f63c5a91 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-utils.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-utils.h b/shell/e-shell-utils.h
index 732931535e..3d86ac0081 100644
--- a/shell/e-shell-utils.h
+++ b/shell/e-shell-utils.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-utils.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-view-menu.h b/shell/e-shell-view-menu.h
index 7f8c3ce0b3..9fb65c048c 100644
--- a/shell/e-shell-view-menu.h
+++ b/shell/e-shell-view-menu.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-view.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index f52d7eb7c7..ae481cf7e3 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -19,9 +19,9 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors:
- *   Ettore Perazzoli <ettore@helixcode.com>
- *   Miguel de Icaza <miguel@helixcode.com>
- *   Matt Loper <matt@helixcode.com>
+ *   Ettore Perazzoli <ettore@ximian.com>
+ *   Miguel de Icaza <miguel@ximian.com>
+ *   Matt Loper <matt@ximian.com>
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index d22e875b0d..077c55705a 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell-view.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 4786c49767..2a8fab2b85 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shell.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
index 36625e2bfe..c4ee9efac3 100644
--- a/shell/e-shortcuts-view-model.c
+++ b/shell/e-shortcuts-view-model.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shortcuts-view-model.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shortcuts-view-model.h b/shell/e-shortcuts-view-model.h
index 85a5047c0a..a0e06ad020 100644
--- a/shell/e-shortcuts-view-model.h
+++ b/shell/e-shortcuts-view-model.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shortcuts-view-model.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-shortcuts-view.h b/shell/e-shortcuts-view.h
index 6152bd230d..26de749fb9 100644
--- a/shell/e-shortcuts-view.h
+++ b/shell/e-shortcuts-view.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-shortcuts-view.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-splash.h b/shell/e-splash.h
index 153d54d7c3..efda6c8ed3 100644
--- a/shell/e-splash.h
+++ b/shell/e-splash.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-splash.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-storage-set-view.h b/shell/e-storage-set-view.h
index 80bdf441e7..359759b37e 100644
--- a/shell/e-storage-set-view.h
+++ b/shell/e-storage-set-view.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-storage-set-view.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c
index a9acc09a46..bfe1bda032 100644
--- a/shell/e-storage-set.c
+++ b/shell/e-storage-set.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-storage-set.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-storage-set.h b/shell/e-storage-set.h
index 30bff0f674..d32c13ea15 100644
--- a/shell/e-storage-set.h
+++ b/shell/e-storage-set.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-storage-set.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/e-storage.h b/shell/e-storage.h
index c32a054dd3..129212389e 100644
--- a/shell/e-storage.h
+++ b/shell/e-storage.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* e-storage.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-local-storage.c b/shell/evolution-local-storage.c
index 0039d21c7e..3221eafe29 100644
--- a/shell/evolution-local-storage.c
+++ b/shell/evolution-local-storage.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-local-storage.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-local-storage.h b/shell/evolution-local-storage.h
index fcd0fe6614..e617e33a35 100644
--- a/shell/evolution-local-storage.h
+++ b/shell/evolution-local-storage.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-local-storage.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-session.c b/shell/evolution-session.c
index 15df5fcae6..9d74744d78 100644
--- a/shell/evolution-session.c
+++ b/shell/evolution-session.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-session.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-session.h b/shell/evolution-session.h
index 5e558d3e56..2b30993936 100644
--- a/shell/evolution-session.h
+++ b/shell/evolution-session.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-session.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c
index 2379d33172..50a92bff21 100644
--- a/shell/evolution-shell-client.c
+++ b/shell/evolution-shell-client.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-shell-client.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-shell-client.h b/shell/evolution-shell-client.h
index 98553a522d..ae6fbfd748 100644
--- a/shell/evolution-shell-client.h
+++ b/shell/evolution-shell-client.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-shell-client.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h
index 9fd52f7eca..d7044001b0 100644
--- a/shell/evolution-shell-component-client.h
+++ b/shell/evolution-shell-component-client.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-shell-component-client.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index e5a377afe0..24d41b492c 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-shell-view.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-shell-view.h b/shell/evolution-shell-view.h
index 0f2fc64267..1fd72c0fe9 100644
--- a/shell/evolution-shell-view.h
+++ b/shell/evolution-shell-view.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-shell-view.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c
index ff54cdcfd7..233a3f1e7c 100644
--- a/shell/evolution-storage-listener.c
+++ b/shell/evolution-storage-listener.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-listener.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-listener.h b/shell/evolution-storage-listener.h
index a17dd6834b..5d813af408 100644
--- a/shell/evolution-storage-listener.h
+++ b/shell/evolution-storage-listener.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-listener.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c
index ee71776186..50b066401b 100644
--- a/shell/evolution-storage-set-view-factory.c
+++ b/shell/evolution-storage-set-view-factory.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-set-view-factory.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-set-view-factory.h b/shell/evolution-storage-set-view-factory.h
index 85710e6cd1..f5a9ee63c3 100644
--- a/shell/evolution-storage-set-view-factory.h
+++ b/shell/evolution-storage-set-view-factory.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-set-view-factory.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c
index b4b39072a7..3edfa14e24 100644
--- a/shell/evolution-storage-set-view-listener.c
+++ b/shell/evolution-storage-set-view-listener.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-set-view-listener.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-set-view-listener.h b/shell/evolution-storage-set-view-listener.h
index 334072a55e..ad91f7b76d 100644
--- a/shell/evolution-storage-set-view-listener.h
+++ b/shell/evolution-storage-set-view-listener.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-set-view-listener.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c
index 0cc64e3b12..6aaac40c56 100644
--- a/shell/evolution-storage-set-view.c
+++ b/shell/evolution-storage-set-view.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-set-view.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage-set-view.h b/shell/evolution-storage-set-view.h
index 36f7c99f63..220e0012e2 100644
--- a/shell/evolution-storage-set-view.h
+++ b/shell/evolution-storage-set-view.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage-set-view.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
index 00a2e8af49..b7339c615c 100644
--- a/shell/evolution-storage.h
+++ b/shell/evolution-storage.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-storage.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/importer/GNOME_Evolution_Importer.idl b/shell/importer/GNOME_Evolution_Importer.idl
index adeb900dde..18ea7a65bb 100644
--- a/shell/importer/GNOME_Evolution_Importer.idl
+++ b/shell/importer/GNOME_Evolution_Importer.idl
@@ -3,9 +3,9 @@
  * Interfaces for the importer framework.
  *
  * Authors:
- *   Iain Holmes  <iain@helixcode.com>
+ *   Iain Holmes  <iain@ximian.com>
  *
- * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2000 Ximian, Inc.
  */
 
 #include <Bonobo.idl>
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 3b38d7bc3f..20142c018d 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-importer-client.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Iain Holmes  <iain@helixcode.com>
+ * Author: Iain Holmes  <iain@ximian.com>
  */
 
 #ifndef EVOLUTION_IMPORTER_CLIENT_H
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index fbefc42806..f41ace28aa 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-importer.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Iain Holmes  <iain@helixcode.com>
+ * Author: Iain Holmes  <iain@ximian.com>
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index dbf672ddbd..abdcfc6bb6 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* evolution-importer.h
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Iain Holmes  <iain@helixcode.com>
+ * Author: Iain Holmes  <iain@ximian.com>
  */
 
 #ifndef EVOLUTION_IMPORTER_H
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 260b62ea77..6e2f20d8d6 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -4,7 +4,7 @@
  * Authors: 
  *    Iain Holmes  <iain@ximian.com>
  *
- * Copyright 2001 Ximian, Inc. (http://www.ximian.com)
+ * Copyright 2001 Ximian, Inc. (www.ximian.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as 
diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h
index 8d528f5e77..5e1523a8e1 100644
--- a/shell/importer/intelligent.h
+++ b/shell/importer/intelligent.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* importer.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/shell/main.c b/shell/main.c
index 8f0bb6c414..f31f460878 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /* main.c
  *
- * Copyright (C) 2000  Helix Code, Inc.
+ * Copyright (C) 2000  Ximian, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as