Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.914
diff -u -p -r1.914 configure.in
--- configure.in	2 Oct 2006 13:26:28 -0000	1.914
+++ configure.in	9 Oct 2006 17:57:47 -0000
@@ -1376,6 +1376,9 @@ AC_SUBST(componentdir)
 idldir="$datadir/idl/evolution-$BASE_VERSION"
 AC_SUBST(idldir)
 
+pixmapsdir="$datadir/pixmaps"
+AC_SUBST(pixmapsdir)
+
 serverdir="$libdir/bonobo/servers"
 AC_SUBST(serverdir)
 
@@ -1444,6 +1447,9 @@ AC_SUBST(viewsdir)
 
 privconduitdir='${libdir}'/evolution/$BASE_VERSION/conduits
 AC_SUBST(privconduitdir)
+
+logofile="$pixmapsdir/evolution-$BASE_VERSION.png"
+AC_SUBST(logofile)
 
 dnl ************************
 dnl IDL/Component Versioning
Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/art/Makefile.am,v
retrieving revision 1.123
diff -u -p -r1.123 Makefile.am
--- art/Makefile.am	25 Sep 2006 13:45:10 -0000	1.123
+++ art/Makefile.am	9 Oct 2006 17:57:48 -0000
@@ -11,14 +11,14 @@ images_DATA = \
 	minus.png
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL_DATA) $(srcdir)/evolution.png  $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
+	$(mkinstalldirs) $(DESTDIR)$(pixmapsdir)
+	$(INSTALL_DATA) $(srcdir)/evolution.png $(DESTDIR)$(logofile)
 if DEFAULT_BINARY
-	cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
+	cd $(DESTDIR)$(pixmapsdir) && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
 endif
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
+	rm -f $(DESTDIR)$(logofile)
 
 EXTRA_DIST = 				\
 	ChangeLog			\
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.214
diff -u -p -r1.214 Makefile.am
--- shell/Makefile.am	22 Dec 2005 02:12:34 -0000	1.214
+++ shell/Makefile.am	9 Oct 2006 17:58:59 -0000
@@ -11,6 +11,7 @@ INCLUDES =							\
 	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"		\
+	-DEVOLUTION_LOGO=\""$(logofile)"\"			\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
 	-DDATADIR=\""$(datadir)"\"				\
Index: shell/e-shell-window-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window-commands.c,v
retrieving revision 1.53
diff -u -p -r1.53 e-shell-window-commands.c
--- shell/e-shell-window-commands.c	4 Sep 2006 12:27:19 -0000	1.53
+++ shell/e-shell-window-commands.c	9 Oct 2006 17:59:00 -0000
@@ -24,14 +24,13 @@
 
 #include <string.h>
 
+#include <gtk/gtk.h>
 #include <glib/gprintf.h>
 
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-url.h>
 
-#include <libgnomeui/gnome-about.h>
-
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -53,6 +52,12 @@
 
 #include "e-shell-importer.h"
 
+#define EVOLUTION_COPYRIGHT \
+	"Copyright \xC2\xA9 1999 - 2006 Novell, Inc. and Others"
+
+#define EVOLUTION_WEBSITE \
+	"http://www.gnome.org/projects/evolution/"
+
 /* Utility functions.  */
 
 static void
@@ -547,62 +552,44 @@ static const char *documentors[] = { 
 	NULL
 };
 
-static GtkWidget *
-about_box_new (void)
-{
-	GtkWidget *about_box = NULL;
-	GdkPixbuf *pixbuf = NULL;
-	char copyright[1024];
-	char *filename = NULL;
-
-	/* The translator-credits string is for translators to list
-	 * per language credits for translation, displayed in the
-	 * about box*/
-	char *translator_credits = _("translator-credits");
-	
-	g_sprintf (copyright, "Copyright \xC2\xA9 1999 - 2006 Novell, Inc. and Others");
-                                                                                
-	filename = g_build_filename (EVOLUTION_DATADIR, "pixmaps",
-				     "evolution-1.5.png", NULL);
-	if (filename != NULL) {
-		pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-		g_free (filename);
-	}
-                                                                                
-	about_box = gnome_about_new ("Evolution",
-				     VERSION,
-				     copyright,
-				     _("Groupware Suite"),
-				     authors, documentors,
-				     strcmp (translator_credits, "translator-credits") ? translator_credits : NULL,
-				     pixbuf);
-	
-        if (pixbuf != NULL)
-                g_object_unref (pixbuf);
-
-	return GTK_WIDGET (about_box);
-}
-
 static void
-command_about_box (BonoboUIComponent *uih,
-		   EShellWindow *window,
-		   const char *path)
+command_about (BonoboUIComponent *uih,
+               EShellWindow *window,
+               const char *path)
 {
-	static GtkWidget *about_box_window = NULL;
+	GdkPixbuf *logo;
+	gchar *translator_credits;
+	GError *error = NULL;
 
-	if (about_box_window != NULL) {
-		gdk_window_raise (about_box_window->window);
-		return;
+	/* The translator-credits string is for translators to list
+	 * per-language credits for translation, displayed in the
+	 * about dialog. */
+	translator_credits = _("translator-credits");
+	if (strcmp (translator_credits, "translator-credits") == 0)
+		translator_credits = NULL;
+
+	logo = gdk_pixbuf_new_from_file (EVOLUTION_LOGO, &error);
+
+	gtk_show_about_dialog (
+		GTK_WINDOW (window),
+		"name", "Evolution",
+		"version", VERSION,
+		"copyright", EVOLUTION_COPYRIGHT,
+		"comments", _("Groupware Suite"),
+		"website", EVOLUTION_WEBSITE,
+		"website-label", _("Evolution Website"),
+		"authors", authors,
+		"documenters", documentors,
+		"translator-credits", translator_credits,
+		"logo", logo,
+		NULL);
+
+	if (logo != NULL)
+		g_object_unref (logo);
+	else {
+		g_warning ("%s", error->message);
+		g_error_free (error);
 	}
-
-	about_box_window = about_box_new ();
-	
-	g_signal_connect (G_OBJECT (about_box_window), "destroy",
-			  G_CALLBACK (gtk_widget_destroyed), &about_box_window);
-
-	gtk_window_set_transient_for (GTK_WINDOW (about_box_window), GTK_WINDOW (window));
-
-	gtk_widget_show (about_box_window);
 }
 
 #if 0
@@ -762,7 +749,7 @@ static BonoboUIVerb tools_verbs[] = {
 static BonoboUIVerb help_verbs [] = {
 	BONOBO_UI_VERB ("QuickReference", (BonoboUIVerbFn) command_quick_reference),
 	BONOBO_UI_VERB ("HelpSubmitBug", (BonoboUIVerbFn) command_submit_bug),
-	BONOBO_UI_VERB ("HelpAbout", (BonoboUIVerbFn) command_about_box),
+	BONOBO_UI_VERB ("HelpAbout", (BonoboUIVerbFn) command_about),
 
 	BONOBO_UI_VERB_END
 };
