Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnopernicus/ChangeLog,v
retrieving revision 1.823
diff -u -r1.823 ChangeLog
--- ChangeLog	6 Apr 2006 13:39:02 -0000	1.823
+++ ChangeLog	11 Apr 2006 17:00:19 -0000
@@ -1,3 +1,14 @@
+2006-04-11  Brian Pepple  <bdpepple@gmail.com>
+
+	* gnopi/gnopi.c (main): 
+	* configure.in: 
+	* gnopi/gnopi_files/Makefile.am (glade_files_DATA): 
+	* gnopi/gnopernicus.desktop.in (Icon): 
+	* gnopi/gnopiui.c (gn_load_gnopernicus_about): 
+	* gnopi/Makefile.am (icondir): Install theme-friendly
+	icons, and simplify the about dialog. See the wiki for
+	more information: http://live.gnome.org/GnomeGoals/AppIcon
+
 2006-04-06 Oana Serb <os@baum.ro>
 
 	* srcore/default.xml.in:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnopernicus/configure.in,v
retrieving revision 1.195
diff -u -r1.195 configure.in
--- configure.in	6 Apr 2006 13:28:20 -0000	1.195
+++ configure.in	11 Apr 2006 17:00:19 -0000
@@ -417,7 +417,7 @@
 GLIB_REQUIRED=2.4.1
 LIBXML_REQUIRED=2.6.7
 CSPI_REQUIRED=1.5.4
-GTK_REQUIRED=2.4.1
+GTK_REQUIRED=2.6.0
 GCONF_REQUIRED=2.6.1
 LIBGLADE_REQUIRED=2.3.6
 LIBGNOME_REQUIRED=2.6.0
Index: gnopi/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- gnopi/Makefile.am	8 Feb 2006 10:19:17 -0000	1.41
+++ gnopi/Makefile.am	11 Apr 2006 17:00:19 -0000
@@ -78,10 +78,19 @@
 	           sv.a2b	\
 	           en_US.a2b	    
 
-pixmapsdir   = $(datadir)/pixmaps
-pixmaps_DATA = gnopernicus.png
+icondir   = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = gnopernicus.png
 
-GNOPERNICUS_ICON = $(pixmapsdir)/$(pixmaps_DATA)
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
 
 desktopdir 	 = $(datadir)/applications
 desktop_in_files = gnopernicus.desktop.in
Index: gnopi/gnopernicus.desktop.in
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/gnopernicus.desktop.in,v
retrieving revision 1.4
diff -u -r1.4 gnopernicus.desktop.in
--- gnopi/gnopernicus.desktop.in	1 Jul 2003 13:29:42 -0000	1.4
+++ gnopi/gnopernicus.desktop.in	11 Apr 2006 17:00:19 -0000
@@ -3,7 +3,7 @@
 _Name=Screen Reader and Magnifier
 _Comment=Assistive Technologies for Blind and Visually Impaired
 Exec=gnopernicus
-Icon=gnopernicus.png
+Icon=gnopernicus
 Terminal=false
 Type=Application
 StartupNotify=true
Index: gnopi/gnopi.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/gnopi.c,v
retrieving revision 1.84
diff -u -r1.84 gnopi.c
--- gnopi/gnopi.c	6 Apr 2006 13:39:03 -0000	1.84
+++ gnopi/gnopi.c	11 Apr 2006 17:00:20 -0000
@@ -317,13 +317,14 @@
 			GNOME_PARAM_POPT_TABLE, poptopt,
 			GNOME_PARAM_HUMAN_READABLE_NAME, _("gnopernicus"),
 			GNOME_PARAM_APP_DATADIR, DATADIR,
-			NULL);    
+			NULL);  
+
+
 
     sru_log_init ();
 
-/* FIXME the next line will be available only starting with gtk+ 2.6 */
-    /* gtk_window_set_default_icon_name ("gnopernicus"); */
-    gtk_window_set_default_icon_from_file (GNOPERNICUS_ICON, NULL);
+    g_set_application_name (_("Gnopernicus"));
+    gtk_window_set_default_icon_name ("gnopernicus");
 
     if (!gn_run_with_parameters ())
     {
Index: gnopi/gnopiui.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/gnopiui.c,v
retrieving revision 1.38
diff -u -r1.38 gnopiui.c
--- gnopi/gnopiui.c	25 Jul 2005 14:21:49 -0000	1.38
+++ gnopi/gnopiui.c	11 Apr 2006 17:00:20 -0000
@@ -143,41 +143,45 @@
 static void
 gn_load_gnopernicus_about (void)
 {
-    GladeXML 		*xml;
-    gchar		*file = NULL;
-    GtkWidget		*about = NULL;
-    GdkPixbuf		*logo = NULL;
-    
-    xml = gn_load_interface ("about.glade2", "dl_about");
-
-    about = glade_xml_get_widget (xml, "dl_about");
-
-    file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, 
-				     "gnopernicus.png", 
-				      TRUE, NULL);
-
-    if (!file)
+    const gchar *authors[] =
     {
-	file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, 
-				     "gnome-about-logo.png", 
-				      TRUE, NULL);
-    }
+	    "Draghi Puterity <mp@baum.de>",
+	    "Adi Dascal <ad@baum.ro>",
+	    "Adriana Iobb <ai@baum.de>",
+	    "Remus Draica <rd@baum.ro>",
+	    "Iuliu Szijjarto <is@baum.ro>",
+	    "Pal Csongor Sprencz <ps@baum.ro>",
+	    "Thanks to",
+	    "Thomas Friehoff <tf@baum.de>",
+	    "Peter Korn	<peter.korn@sun.com>",
+	    "Bill Haneman <bill.haneman@sun.com>",
+	    "Marc Mulcahy <marc.mulcahy@sun.com>",
+	    "Michael Meeks <michael@ximian.com>",
+	    "Padraig O'Briain <Padraig.Obriain@sun.com>",
+	    "Calum Benson <calum.benson@sun.com>",
+	    "Brian Cameron <Brian.Cameron@sun.com>",
+	    "Mario Lang <mlang@delysid.org>",
+	    "And everyone else who has participated",
+	    "in the gnopernicus effort and is not mentioned here.",
+	    NULL
+    };
 
-    g_object_set (about, "version", VERSION, NULL);
-
-    if (file)
+    const gchar *documenters[] =
     {
-	logo = gdk_pixbuf_new_from_file (file, NULL);
-	g_object_set (about, "logo", logo, NULL);
-    }
-
-    if (xml) 
-	g_object_unref (G_OBJECT (xml));
-
-    if (logo)
-	g_object_unref (logo);
+      NULL
+    };
 
-    gtk_widget_show (about);
+    gtk_show_about_dialog (GTK_WINDOW (w_gnopernicus),
+			   "authors", authors,
+			   "comments", _("Screen Reader and Magnifier for the GNOME Desktop"),
+			   "copyright", "Copyright \xc2\xa9 2001-2005 BAUM Retec AG\n"
+			                "Copyright \xc2\xa9 2001-2005 BAUM Engineering SRL\n"
+			                "Copyright \xc2\xa9 2001-2005 Sun Microsystems",
+			   "documenters", documenters,
+			   "logo-icon-name", "gnopernicus",
+			   "translator-credits", _("translator-credits"),
+			   "version", VERSION,
+			   NULL);
 }
 
 void
Index: gnopi/gnopi_files/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/gnopi_files/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- gnopi/gnopi_files/Makefile.am	1 Aug 2003 15:55:29 -0000	1.12
+++ gnopi/gnopi_files/Makefile.am	11 Apr 2006 17:00:20 -0000
@@ -15,7 +15,6 @@
 
 glade_files_DATA =				\
 	gnopi.glade2				\
-	about.glade2				\
 	braille.xpm				\
 	keyboard.xpm				\
 	monitor.png				\
