? gnome-desktop/gnome-about/gnome-64.png
Index: gnome-desktop/gnome-about/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-desktop/gnome-about/ChangeLog,v
retrieving revision 1.195
diff -u -r1.195 ChangeLog
--- gnome-desktop/gnome-about/ChangeLog	2 Jul 2005 10:18:32 -0000	1.195
+++ gnome-desktop/gnome-about/ChangeLog	10 Jul 2005 20:30:35 -0000
@@ -1,3 +1,12 @@
+==================== 2.11.5 ====================
+
+2005-07-10  Luca Cavalli <loopback@slackit.org>
+
+	* gnome-64.gif: Removed.
+	* gnome-64.png: Added new trademarked logo.
+	* gnome-about.c: Removed any reference to the old "logo button"
+	and added support for the new trademarked one.
+
 ==================== 2.11.4 ====================
 
 ==================== 2.11.3 ====================
Index: gnome-desktop/gnome-about/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-desktop/gnome-about/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- gnome-desktop/gnome-about/Makefile.am	11 Jan 2005 09:27:46 -0000	1.18
+++ gnome-desktop/gnome-about/Makefile.am	10 Jul 2005 20:30:35 -0000
@@ -21,7 +21,7 @@
 desktop_in_files = gnome-about.desktop.in
 
 aboutdir = $(datadir)/gnome-about
-about_DATA = gnome-64.gif
+about_DATA = gnome-64.png
 
 EXTRA_DIST = $(about_DATA)
 
Index: gnome-desktop/gnome-about/gnome-about.c
===================================================================
RCS file: /cvs/gnome/gnome-desktop/gnome-about/gnome-about.c,v
retrieving revision 1.66
diff -u -r1.66 gnome-about.c
--- gnome-desktop/gnome-about/gnome-about.c	13 Apr 2005 08:26:22 -0000	1.66
+++ gnome-desktop/gnome-about/gnome-about.c	10 Jul 2005 20:30:36 -0000
@@ -476,7 +476,7 @@
 }
 
 static GdkPixbuf *
-load_button (void)
+load_logo (void)
 {
 	gchar *file;
 	GdkPixbuf *pixbuf;
@@ -484,10 +484,10 @@
 
 	file = gnome_program_locate_file (NULL,
 					  GNOME_FILE_DOMAIN_DATADIR,
-					  "gnome-about/gnome-64.gif",
+					  "gnome-about/gnome-64.png",
 					  TRUE, NULL);
 	if (!file) {
-		show_error_dialog (_("Could not locate the GNOME logo button."));
+		show_error_dialog (_("Could not locate the GNOME logo."));
 
 		return NULL;
 	}
@@ -944,7 +944,7 @@
 	GnomeCanvasPoints *points;
 
 	GdkPixbuf *header;
-	GdkPixbuf *button;
+	GdkPixbuf *logo;
 
 	gdouble current_x;
 	gdouble current_y;
@@ -979,14 +979,14 @@
 				      "pixbuf", header,
 				      NULL);
 
-	/* load button logo in advance, we need it's size */
-	button = load_button ();
-	if (!button)
+	/* load logo in advance, we need it's size */
+	logo = load_logo ();
+	if (!logo)
 		/* emergency stop complete with leaks */
 		return NULL;
 
 	/* and a coulple o' links */
-	current_x = 10.0 + (gdouble)gdk_pixbuf_get_width (button) + 10.0;
+	current_x = 10.0 + (gdouble)gdk_pixbuf_get_width (logo) + 10.0;
 	current_y = (gdouble)gdk_pixbuf_get_height (header) + 5.0;
 
 	href = href_item_new (root,
@@ -1059,12 +1059,12 @@
 
 	gnome_canvas_points_free (points);
 
-	/* the gnome button logo */
+	/* the gnome logo */
 	item = gnome_canvas_item_new (root,
 				      gnome_canvas_pixbuf_get_type (),
 				      "x", 10.0,
 				      "y", 10.0,
-				      "pixbuf", button,
+				      "pixbuf", logo,
 				      NULL);
 
 	/* and some introduction text */
