diff -urN gnome-desktop-2.6.1/configure.in gnome-desktop-2.6.1-hacked/configure.in

--- gnome-desktop-2.6.1/configure.in	2004-04-20 00:25:37.000000000 +1200

+++ gnome-desktop-2.6.1-hacked/configure.in	2004-06-08 13:11:31.000000000 +1200

@@ -32,18 +32,25 @@

 GNOME_MINOR=6

 GNOME_MICRO=1

 GNOME_DISTRIBUTOR="GNOME.Org"

+GNOME_DISTRIBUTOR_VERSION=

 GNOME_DATE=`date +"%Y-%m-%d"`

 AC_ARG_WITH(gnome_distributor, [  --with-gnome-distributor=DISTRIBUTOR  Specify name of GNOME distributor])

+AC_ARG_WITH(gnome_distributor_version, [  --with_gnome-distributor-version=DISTRIBUTORVERSION  Specify version of GNOME distribution])

 if test "x$with_gnome_distributor" != x ; then

   GNOME_DISTRIBUTOR=$with_gnome_distributor

 fi

+if test "x$with_gnome_distributor_version" != x ; then

+  GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version

+fi

+

 AC_SUBST(GNOME_PLATFORM)

 AC_SUBST(GNOME_MINOR)

 AC_SUBST(GNOME_MICRO)

 AC_SUBST(GNOME_DISTRIBUTOR)

+AC_SUBST(GNOME_DISTRIBUTOR_VERSION)

 AC_SUBST(GNOME_DATE)

 GNOME_COMPILE_WARNINGS(yes)

diff -urN gnome-desktop-2.6.1/configure.in.orig gnome-desktop-2.6.1-hacked/configure.in.orig

--- gnome-desktop-2.6.1/configure.in.orig	1970-01-01 12:00:00.000000000 +1200

+++ gnome-desktop-2.6.1-hacked/configure.in.orig	2004-06-08 13:11:21.000000000 +1200

@@ -0,0 +1,177 @@

+AC_INIT(libgnome-desktop)

+AM_CONFIG_HEADER(config.h)

+AM_INIT_AUTOMAKE(gnome-desktop, 2.6.1)

+

+dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work

+AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")

+

+# Before making a release, the LT_VERSION string should be modified.

+# The string is of the form C:R:A.

+# - If interfaces have been changed or added, but binary compatibility has

+#   been preserved, change to C+1:0:A+1

+# - If binary compatibility has been broken (eg removed or changed interfaces)

+#   change to C+1:0:0

+# - If the interface is the same as the previous version, change to C:R+1:A

+

+LT_VERSION=3:12:1

+AC_SUBST(LT_VERSION)

+

+AM_MAINTAINER_MODE

+

+AC_PROG_INTLTOOL

+

+AC_ISC_POSIX

+AC_PROG_CC

+AC_STDC_HEADERS

+AC_ARG_PROGRAM

+AC_LIBTOOL_WIN32_DLL

+AM_PROG_LIBTOOL

+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)

+

+GNOME_PLATFORM=2

+GNOME_MINOR=6

+GNOME_MICRO=1

+GNOME_DISTRIBUTOR="GNOME.Org"

+GNOME_DATE=`date +"%Y-%m-%d"`

+

+AC_ARG_WITH(gnome_distributor, [  --with-gnome-distributor=DISTRIBUTOR  Specify name of GNOME distributor])

+

+if test "x$with_gnome_distributor" != x ; then

+  GNOME_DISTRIBUTOR=$with_gnome_distributor

+fi

+

+AC_SUBST(GNOME_PLATFORM)

+AC_SUBST(GNOME_MINOR)

+AC_SUBST(GNOME_MICRO)

+AC_SUBST(GNOME_DISTRIBUTOR)

+AC_SUBST(GNOME_DATE)

+

+GNOME_COMPILE_WARNINGS(yes)

+

+AC_ARG_ENABLE(deprecations,

+              [AC_HELP_STRING([--enable-deprecations],

+                              [warn about deprecated usages [default=no]])],,

+              [enable_deprecations=no])

+

+if test "x$enable_deprecations" = "xyes"; then

+   DISABLE_DEPRECATED_CFLAGS="\

+-DG_DISABLE_DEPRECATED \

+-DGDK_DISABLE_DEPRECATED \

+-DGTK_DISABLE_DEPRECATED \

+-DGDK_PIXBUF_DISABLE_DEPRECATED \

+-DGNOME_DISABLE_DEPRECATED"

+   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)

+fi

+

+dnl If you add a version number here, you *must* add an AC_SUBST line for

+dnl it too, or it will never make it into the spec file!

+

+GDK_PIXBUF_REQUIRED=2.0.3

+GTK_REQUIRED=2.1.2

+LIBGNOMECANVAS_REQUIRED=2.0.0

+LIBGNOMEUI_REQUIRED=2.1.0

+GNOME_VFS_REQUIRED=2.0.0

+STARTUP_NOTIFICATION_REQUIRED=0.5

+

+AC_SUBST(GTK_REQUIRED)

+AC_SUBST(GDK_PIXBUF_REQUIRED)

+AC_SUBST(LIBGNOMEUI_REQUIRED)

+AC_SUBST(LIBGNOMECANVAS_REQUIRED)

+AC_SUBST(GNOME_VFS_REQUIRED)

+AC_SUBST(STARTUP_NOTIFICATION_REQUIRED)

+

+if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then

+  echo "Building with libstartup-notification"

+  AC_DEFINE(HAVE_STARTUP_NOTIFICATION)

+  with_startup_notification=yes

+  STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0

+else

+  echo "***** WARNING: Building without libstartup-notification"

+  with_startup_notification=no

+  STARTUP_NOTIFICATION_PACKAGE=

+fi

+

+AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)

+

+dnl pkg-config dependency checks

+

+PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE)

+AC_SUBST(GNOME_DESKTOP_CFLAGS)

+AC_SUBST(GNOME_DESKTOP_LIBS)

+

+PKG_CHECK_MODULES(GNOME_ABOUT, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED)

+AC_SUBST(GNOME_ABOUT_CFLAGS)

+AC_SUBST(GNOME_ABOUT_LIBS)

+

+dnl scrollkeeper checks

+

+AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)

+if test x$SCROLLKEEPER_CONFIG = xno; then

+  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)

+fi

+

+dnl Language Support

+

+GETTEXT_PACKAGE=gnome-desktop-2.0

+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")

+AC_SUBST(GETTEXT_PACKAGE)

+

+ALL_LINGUAS="af am ar az be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja kn ko li lt lv mi mk ml mn mr ms ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tk tr uk vi wa yi zh_CN zh_TW"

+AM_GLIB_GNU_GETTEXT

+

+

+dnl Place to look for KDE menus

+

+AC_ARG_WITH(kde-datadir, [  --with-kde-datadir=DIR  Location of KDE data])

+

+if test "x$with_kde_datadir" = x ; then

+  kde_datadir=/usr/share

+else

+  kde_datadir=$with_kde_datadir

+fi

+

+AC_DEFINE_UNQUOTED(KDE_MENUDIR, "$kde_datadir/applnk")

+AC_DEFINE_UNQUOTED(KDE_ICONDIR, "$kde_datadir/icons")

+AC_DEFINE_UNQUOTED(KDE_MINI_ICONDIR, "$kde_datadir/icons/mini")

+

+dnl Don't use AC_PROG_AWK since we need the full pathname.

+AC_PATH_PROGS(AWK, mawk gawk nawk awk, )

+AC_PATH_PROGS(PERL, perl5 perl)

+

+dnl define a MAINT-like variable REBUILD which is set if Perl

+dnl and awk are found, so autogenerated sources can be rebuilt

+AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)

+REBUILD=\#

+if test "x$enable_rebuilds" = "xyes" && \

+     test -n "$PERL" && \

+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \

+     test -n "$AWK" ; then

+  REBUILD=

+fi

+AC_SUBST(REBUILD)

+

+AC_OUTPUT([

+Makefile

+gnome-desktop.spec

+desktop-links/Makefile

+gnome-about/Makefile

+gnome-about/headers/Makefile

+libgnome-desktop/Makefile

+libgnome-desktop/libgnome/Makefile

+libgnome-desktop/libgnomeui/Makefile

+libgnome-desktop/gnome-desktop-2.0.pc

+libgnome-desktop/gnome-desktop-2.0-uninstalled.pc

+gnome-version.xml.in

+po/Makefile.in

+pixmaps/Makefile

+desktop-docs/Makefile

+desktop-docs/fdl/Makefile

+desktop-docs/fdl/C/Makefile

+desktop-docs/gpl/Makefile

+desktop-docs/gpl/C/Makefile

+desktop-docs/lgpl/Makefile

+desktop-docs/lgpl/C/Makefile

+desktop-docs/gnome-feedback/Makefile

+desktop-docs/gnome-feedback/C/Makefile

+man/Makefile

+])

diff -urN gnome-desktop-2.6.1/gnome-about/contributors.h gnome-desktop-2.6.1-hacked/gnome-about/contributors.h

--- gnome-desktop-2.6.1/gnome-about/contributors.h	2004-03-23 03:20:30.000000000 +1200

+++ gnome-desktop-2.6.1-hacked/gnome-about/contributors.h	2004-06-08 13:11:31.000000000 +1200

@@ -10,6 +10,88 @@

 /* Please keep this in alphabetical order */

 static gchar *contributors[] = {

+	"Sowmya Adiga",

+	"Dan Baigent",

+	"Geoff Baysinger",

+	"Calum Benson",

+	"Leo Binchy",

+	"Chandrashekhar BK",

+	"Oliver Braun",

+	"Stephen Browne",

+	"Brian Cameron",

+	"Suresh Chandrasekharan",

+	"Erwann Chenede",

+	"Martin Damboldt ",

+	"Simford Dong",

+	"York Du",

+	"Olaf Felka",

+	"Glynn Foster",

+	"Carl Gadener",

+	"Karl Gaffney",

+	"Dirk Grobler",

+	"Patrick Gu",

+	"Leena Gunda",

+	"Ii Gyoung Park",

+	"Susan Jefferies",

+	"Henry Jia",

+	"Jack Jia",

+	"Rick Ju",

+	"Matt Keenan",

+	"Robert Kinsella",

+	"Laszlo Kovacs",

+	"Michael Krivoruchko",

+	"Kaushal Kumar",

+	"Thorsten Laux",

+	"Nancy Lee",

+	"Mike Lei",

+	"Jessie Li",

+	"Gary Little",

+	"Calvin Liu",

+	"Harry Lu",

+	"Robin Lu",

+	"Yogeesh MB",

+	"Dermot McCluskey",

+	"Mark McLoughlin",

+	"Jeff McMeekin",

+	"Ashish Mukharji ",

+	"Kaveri Murthy",

+	"Muktha Narayan",

+	"Brian Nitz",

+	"Shane O'Connor",

+	"Robert O'Dea",

+	"Narayana Pattipati",

+	"Vijaykumar Patwari",

+	"Laszlo Peter",

+	"Terri Ponce",

+	"Niall Power",

+	"Derek Rafter ",

+	"Arvind Samptur",

+	"Curtis Sasaki",

+	"Hema Seetharamaiah",

+	"Leon Sha ",

+	"Archana Shah",

+	"Kalpesh Shah",

+	"Luke Shi",

+	"Sidhartha Sinha",

+	"Louise Siu",

+	"Anand Subramanian",

+	"Jerry Tan",

+	"Ghee Teo",

+	"Michael Twomey",

+	"Balamurali Viswanathan",

+	"Deirdre Williams",

+	"Joshua Xia",

+	"Antonio Xu ",

+	"Amith Yamasani",

+	"Ervin Yan",

+	"Jay Yan",

+	"Mark Yang",

+	"Bolian Yin",

+	"Kyle Yuan",

+	"Pete Zha",

+	"Leon Zhang",

+	"Louie Zhao",

+	"end_of_sun_contributors",

 	"J\xc3\xa9r\xc3\xb4me Abela",

 	"Rob Adams",

 	"Lauri Alanko",

diff -urN gnome-desktop-2.6.1/gnome-about/gnome-about.c gnome-desktop-2.6.1-hacked/gnome-about/gnome-about.c

--- gnome-desktop-2.6.1/gnome-about/gnome-about.c	2004-04-20 00:27:40.000000000 +1200

@@ -54,6 +54,9 @@

 static char             **introduction_messages = NULL;

 static GnomeCanvasItem   *subheader = NULL;

+static GnomeCanvasItem   *welcome_text = NULL;

+static GnomeCanvasItem   *version_text = NULL;

+static char              *version_string = NULL;

 static gdouble            version_info_height = 0.0;

 static gint               contrib_i = 0;

@@ -136,6 +139,29 @@

 	if (!contributors[contrib_i])

 		text = g_strdup_printf ("<b>%s</b>", _("The End!"));

+	else if (g_strcasecmp (contributors[contrib_i], "end_of_sun_contributors") == 0 ) {

+		gchar *welcome;

+		welcome = g_strdup_printf ("<big><big><b>%s</b></big></big>",

+					_("Welcome to the GNOME Desktop"));

+		gnome_canvas_item_set (welcome_text,

+				       "markup", welcome,

+				       "anchor", GTK_ANCHOR_NW,

+				       "fill_color", "#000000",

+				       NULL);

+		if (version_string && version_string[0]) {

+			gchar *version = g_strdup_printf ("<b>%s: </b>%s",

+							_("Version"), version_string);

+			gnome_canvas_item_set (version_text,

+					       "markup", version,

+					       "anchor", GTK_ANCHOR_NW,

+					       "fill_color", "#000000",

+					       NULL);

+			g_free (version);

+		}

+		g_free (welcome);

+		contrib_i++;

+		text = g_strdup_printf ("<b>%s</b>", contributors[contrib_i]);

+	}

 	else {

 		text = g_strdup_printf ("<b>%s</b>", contributors[contrib_i]);

 		contrib_i++;

@@ -166,6 +192,29 @@

 		return FALSE;

 	}

+	if (g_strcasecmp (contributors[contrib_i], "end_of_sun_contributors") == 0 ) {

+		gchar *welcome;

+		welcome = g_strdup_printf ("<big><big><b>%s</b></big></big>",

+					_("Welcome to the GNOME Desktop"));

+		gnome_canvas_item_set (welcome_text,

+				       "markup", welcome,

+				       "anchor", GTK_ANCHOR_NW,

+				       "fill_color", "#000000",

+				       NULL);

+		if (version_string && version_string[0]) {

+			gchar *version = g_strdup_printf ("<b>%s: </b>%s",

+							_("Version"), version_string);

+			gnome_canvas_item_set (version_text,

+					       "markup", version,

+					       "anchor", GTK_ANCHOR_NW,

+					       "fill_color", "#000000",

+					       NULL);

+			g_free (version);

+		}

+		g_free (welcome);

+		contrib_i++;

+	}

+

 	if (!contributor) {

 		gchar *text;

@@ -520,6 +569,7 @@

 	const gchar *text;

 	const gchar *url;

+	gboolean is_link;

 } HRefItem;

 static gboolean

@@ -546,18 +596,38 @@

 	case GDK_BUTTON_PRESS: {

 		GError *error= NULL;

-		gnome_url_show (href->url, &error);

-		if (error) {

-			char *message;

-

-			message = g_strdup_printf (_("Could not open the address \"%s\": %s"),

-						   href->url, error->message);

-			show_error_dialog (message);

+		if (!href->is_link) {

+			gnome_url_show (href->url, &error);

+			if (error) {

+				char *message;

+

+				message = g_strdup_printf (_("Could not open the address \"%s\": %s"),

+				 			   href->url, error->message);

+				show_error_dialog (message);

-			g_free (message);

-			g_error_free (error);

-		}

+				g_free (message);

+				g_error_free (error);

+			}

+		} else {

+			char *tmp;

+			tmp = g_find_program_in_path (href->url);

+                                                                                                                                                             

+  			if (tmp) {

+    				g_spawn_command_line_async (tmp, &error);

+    				g_free (tmp);

+  			}

+

+			if (error) {

+				char *message;

+				

+				message = g_strdup_printf (_("Could not execute \"%s\": %s"),

+							   href->url, error->message);

+				show_error_dialog (message);

+				g_free (message);

+				g_error_free (error);

+			}

+		}

 		return TRUE;

 	}

@@ -572,6 +642,7 @@

 href_item_new (GnomeCanvasGroup *group,

 	       const gchar      *text,

 	       const gchar      *url,

+	       gboolean          is_link,

 	       gdouble          *current_x,

 	       gdouble          *current_y)

 {

@@ -581,6 +652,7 @@

 	item = g_new0 (HRefItem, 1);

 	item->text = g_strdup (text);

 	item->url = g_strdup (url);

+	item->is_link = is_link;

 	item->item =

 		gnome_canvas_item_new (group,

@@ -789,8 +861,8 @@

 	char *platform = NULL;

 	char *minor = NULL;

 	char *micro = NULL;

-	char *version_string = NULL;

 	char *distributor_string = NULL;

+	char *distributor_version_string = NULL;

 	char *build_date_string = NULL;

 	char *text = NULL;

@@ -836,6 +908,8 @@

 			minor = g_strdup (value);

 		if (!g_ascii_strcasecmp (name, "micro") && value && value[0])

 			micro = g_strdup (value);

+		if (!g_ascii_strcasecmp (name, "distributor-version") && value && value[0])

+			distributor_version_string = g_strdup (value);

 		if (!g_ascii_strcasecmp (name, "distributor") && value && value[0])

 			distributor_string = g_strdup (value);

 		if (!g_ascii_strcasecmp (name, "date") && value && value[0])

@@ -851,10 +925,10 @@

 		version_string = g_strconcat (platform, NULL);

 	if (!version_string && !micro)

-		version_string = g_strconcat (platform, ".", minor, NULL);

+		version_string = g_strconcat (platform, " ", minor, NULL);

 	if (!version_string)

-		version_string = g_strconcat (platform, ".", minor, ".",

+		version_string = g_strconcat (platform, " ", minor, ".",