reviewed by: Glynn Foster <glynn.foster@ireland.sun.com>

	No significant code changes.  Just adding bug numbers to FIXMEs.
	The only real code change (which happens to be a commenting out of
	something) is a workaround for a tinderbox problem.

	* libnautilus-extensions/nautilus-font-factory.c:
	(nautilus_font_factory_get_font_by_family):
	Bug number for FIXME.

	* libnautilus-extensions/nautilus-font-manager.c:
	(nautilus_font_manager_get_default_font),
	(nautilus_font_manager_get_default_bold_font):
	Bug number for FIXME.
	Comment out the SOURCE_DATADIR font hack until it works better.
	Fixes broken tinderbox checks.  Checks will still run even if not
	with the optimal setup.  I have an idea how to fix this later
	using a configure.in hack.  Added FIXME and bug number for this
	issue.

	* libnautilus-extensions/nautilus-glyph.c:
	(nautilus_glyph_draw_to_pixbuf):
	Bug number for FIXME.

	* libnautilus-extensions/nautilus-icon-container.c:
	Bug number for FIXME and reworked FIXME blurb to match bug report.

	(nautilus_icon_container_initialize):
	* libnautilus-extensions/nautilus-scalable-font.c:
	(nautilus_scalable_font_get_default_font),
	(nautilus_scalable_font_get_default_bold_font):
	Bug number for FIXMEs.

11 files changed, 75 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 55dcb16cb..99121d871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2001-03-05  Ramiro Estrugo  <ramiro@eazel.com>
+
+	reviewed by: Glynn Foster  <glynn.foster@ireland.sun.com>
+
+	No significant code changes.  Just adding bug numbers to FIXMEs.
+	The only real code change (which happens to be a commenting out of
+	something) is a workaround for a tinderbox problem.
+	
+	* libnautilus-extensions/nautilus-font-factory.c:
+	(nautilus_font_factory_get_font_by_family):
+	Bug number for FIXME.
+	
+	* libnautilus-extensions/nautilus-font-manager.c:
+	(nautilus_font_manager_get_default_font),
+	(nautilus_font_manager_get_default_bold_font):
+	Bug number for FIXME.
+	Comment out the SOURCE_DATADIR font hack until it works better.
+	Fixes broken tinderbox checks.  Checks will still run even if not
+	with the optimal setup.  I have an idea how to fix this later
+	using a configure.in hack.  Added FIXME and bug number for this
+	issue.
+	
+	* libnautilus-extensions/nautilus-glyph.c:
+	(nautilus_glyph_draw_to_pixbuf):
+	Bug number for FIXME.
+
+	* libnautilus-extensions/nautilus-icon-container.c:
+	Bug number for FIXME and reworked FIXME blurb to match bug report.
+
+	(nautilus_icon_container_initialize):
+	* libnautilus-extensions/nautilus-scalable-font.c:
+	(nautilus_scalable_font_get_default_font),
+	(nautilus_scalable_font_get_default_bold_font):
+	Bug number for FIXMEs.
+
 2001-03-05  Dan Mueth  <dan@eazel.com>
 
 	Removed Eazel logo from screenshot.
diff --git a/libnautilus-extensions/nautilus-font-factory.c b/libnautilus-extensions/nautilus-font-factory.c
index 042b4be30..ca7e7583d 100644
--- a/libnautilus-extensions/nautilus-font-factory.c
+++ b/libnautilus-extensions/nautilus-font-factory.c
@@ -223,7 +223,7 @@ nautilus_font_factory_get_font_by_family (const char *family,
 
 	factory = nautilus_get_current_font_factory ();
 	while (*iter) {
-		/* FIXME bugzilla.eazel.com xxxx: 
+		/* FIXME bugzilla.eazel.com 7347: 
 		 * Its a hack that we check for "-" prefixes in font names.
 		 * We do this in order not to break transalted font families.
 		 */
diff --git a/libnautilus-extensions/nautilus-font-manager.c b/libnautilus-extensions/nautilus-font-manager.c
index e2f982121..cde011dc5 100644
--- a/libnautilus-extensions/nautilus-font-manager.c
+++ b/libnautilus-extensions/nautilus-font-manager.c
@@ -1059,9 +1059,17 @@ nautilus_font_manager_get_default_font (void)
 {
 	guint i;
 
+	/* FIXME bugzilla.eazel.com 7343:
+	 * We want this to work in the case where nautilus has
+	 * not undergone 'make install'.  In order to do that
+	 * we need to find out our fully qualified pwd - 
+	 * probably using a configure.on NAUTILUS_PWD=`pwd`
+	 * hack of some kind.  For now, commenting this out
+	 * to make checks work in tinderbox again.
+	 */
 	static const char *default_fonts[] = {
 		DEFAULT_FONT_DIRECTORY "/n019003l.pfb",
-		SOURCE_DATADIR "/fonts/urw/n019003l.pfb",
+		/* SOURCE_DATADIR "/fonts/urw/n019003l.pfb", */
 		"/usr/share/fonts/default/Type1/n019003l.pfb",
 		"/usr/X11R6/lib/X11/fonts/Type1/lcdxsr.pfa"
 	};
@@ -1082,7 +1090,8 @@ nautilus_font_manager_get_default_bold_font (void)
 
 	static const char *default_bold_fonts[] = {
 		DEFAULT_FONT_DIRECTORY "/n019004l.pfb",
-		SOURCE_DATADIR "/fonts/urw/n019004l.pfb",
+		"/usr/share/fonts/default/Type1/n019003l.pfb",
+		/* SOURCE_DATADIR "/fonts/urw/n019004l.pfb", */
 	};
 
 	for (i = 0; i < NAUTILUS_N_ELEMENTS (default_bold_fonts); i++) {
diff --git a/libnautilus-extensions/nautilus-glyph.c b/libnautilus-extensions/nautilus-glyph.c
index c500085ea..80b43e7db 100644
--- a/libnautilus-extensions/nautilus-glyph.c
+++ b/libnautilus-extensions/nautilus-glyph.c
@@ -261,7 +261,7 @@ nautilus_glyph_draw_to_pixbuf (const NautilusGlyph *glyph,
 	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
 	g_return_if_fail (glyph_is_valid (glyph));
 
-	/* FIXME bugzilla.eazel.com xxxx: We currently dont handle opacities
+	/* FIXME bugzilla.eazel.com 7346: We currently dont handle opacities
 	 * other than 0xFF.
 	 */
 	g_return_if_fail (opacity == NAUTILUS_OPACITY_FULLY_OPAQUE);
diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c
index 367d39988..64bf28a45 100644
--- a/libnautilus-extensions/nautilus-icon-container.c
+++ b/libnautilus-extensions/nautilus-icon-container.c
@@ -3316,7 +3316,11 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
  	/* font table - this isn't exactly proportional, but it looks better than computed */
 	/* FIXME bugzilla.eazel.com 5093: Font name is hard-coded here. */
 	/* FIXME bugzilla.eazel.com 5101: Font size is hard-coded here. */
-	/* FIXME bugzilla.eazel.com xxxx: Fonts marked for localization in disparate places. */
+
+	/* FIXME bugzilla.eazel.com 7345:
+	 * Default font "helvetica" hard coded and marked for translatation in many
+	 * placesFonts hard marked for localization in disparate places.
+	 */
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLEST] = nautilus_font_factory_get_font_by_family (_("helvetica"), 8);
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLER] = nautilus_font_factory_get_font_by_family (_("helvetica"), 8);
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALL] = nautilus_font_factory_get_font_by_family (_("helvetica"), 10);
diff --git a/libnautilus-extensions/nautilus-scalable-font.c b/libnautilus-extensions/nautilus-scalable-font.c
index 4e9a92e3a..875d5843d 100644
--- a/libnautilus-extensions/nautilus-scalable-font.c
+++ b/libnautilus-extensions/nautilus-scalable-font.c
@@ -300,7 +300,7 @@ nautilus_scalable_font_get_default_font (void)
 	char *default_font_file_name;
 	NautilusScalableFont *default_font;
 
-	/* FIXME bugzilla.eazel.com xxxx:
+	/* FIXME bugzilla.eazel.com 7344:
 	 * Its evil that we have to peek preferences here to
 	 * find the default smooth font, but so it goes.
 	 */
@@ -323,7 +323,7 @@ nautilus_scalable_font_get_default_bold_font (void)
 	char *default_bold_font_file_name;
 	NautilusScalableFont *default_bold_font;
 
-	/* FIXME bugzilla.eazel.com xxxx:
+	/* FIXME bugzilla.eazel.com 7344:
 	 * Its evil that we have to peek preferences here to
 	 * find the default smooth font, but so it goes.
 	 */
diff --git a/libnautilus-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c
index 042b4be30..ca7e7583d 100644
--- a/libnautilus-private/nautilus-font-factory.c
+++ b/libnautilus-private/nautilus-font-factory.c
@@ -223,7 +223,7 @@ nautilus_font_factory_get_font_by_family (const char *family,
 
 	factory = nautilus_get_current_font_factory ();
 	while (*iter) {
-		/* FIXME bugzilla.eazel.com xxxx: 
+		/* FIXME bugzilla.eazel.com 7347: 
 		 * Its a hack that we check for "-" prefixes in font names.
 		 * We do this in order not to break transalted font families.
 		 */
diff --git a/libnautilus-private/nautilus-font-manager.c b/libnautilus-private/nautilus-font-manager.c
index e2f982121..cde011dc5 100644
--- a/libnautilus-private/nautilus-font-manager.c
+++ b/libnautilus-private/nautilus-font-manager.c
@@ -1059,9 +1059,17 @@ nautilus_font_manager_get_default_font (void)
 {
 	guint i;
 
+	/* FIXME bugzilla.eazel.com 7343:
+	 * We want this to work in the case where nautilus has
+	 * not undergone 'make install'.  In order to do that
+	 * we need to find out our fully qualified pwd - 
+	 * probably using a configure.on NAUTILUS_PWD=`pwd`
+	 * hack of some kind.  For now, commenting this out
+	 * to make checks work in tinderbox again.
+	 */
 	static const char *default_fonts[] = {
 		DEFAULT_FONT_DIRECTORY "/n019003l.pfb",
-		SOURCE_DATADIR "/fonts/urw/n019003l.pfb",
+		/* SOURCE_DATADIR "/fonts/urw/n019003l.pfb", */
 		"/usr/share/fonts/default/Type1/n019003l.pfb",
 		"/usr/X11R6/lib/X11/fonts/Type1/lcdxsr.pfa"
 	};
@@ -1082,7 +1090,8 @@ nautilus_font_manager_get_default_bold_font (void)
 
 	static const char *default_bold_fonts[] = {
 		DEFAULT_FONT_DIRECTORY "/n019004l.pfb",
-		SOURCE_DATADIR "/fonts/urw/n019004l.pfb",
+		"/usr/share/fonts/default/Type1/n019003l.pfb",
+		/* SOURCE_DATADIR "/fonts/urw/n019004l.pfb", */
 	};
 
 	for (i = 0; i < NAUTILUS_N_ELEMENTS (default_bold_fonts); i++) {
diff --git a/libnautilus-private/nautilus-glyph.c b/libnautilus-private/nautilus-glyph.c
index c500085ea..80b43e7db 100644
--- a/libnautilus-private/nautilus-glyph.c
+++ b/libnautilus-private/nautilus-glyph.c
@@ -261,7 +261,7 @@ nautilus_glyph_draw_to_pixbuf (const NautilusGlyph *glyph,
 	g_return_if_fail (nautilus_gdk_pixbuf_is_valid (pixbuf));
 	g_return_if_fail (glyph_is_valid (glyph));
 
-	/* FIXME bugzilla.eazel.com xxxx: We currently dont handle opacities
+	/* FIXME bugzilla.eazel.com 7346: We currently dont handle opacities
 	 * other than 0xFF.
 	 */
 	g_return_if_fail (opacity == NAUTILUS_OPACITY_FULLY_OPAQUE);
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 367d39988..64bf28a45 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3316,7 +3316,11 @@ nautilus_icon_container_initialize (NautilusIconContainer *container)
  	/* font table - this isn't exactly proportional, but it looks better than computed */
 	/* FIXME bugzilla.eazel.com 5093: Font name is hard-coded here. */
 	/* FIXME bugzilla.eazel.com 5101: Font size is hard-coded here. */
-	/* FIXME bugzilla.eazel.com xxxx: Fonts marked for localization in disparate places. */
+
+	/* FIXME bugzilla.eazel.com 7345:
+	 * Default font "helvetica" hard coded and marked for translatation in many
+	 * placesFonts hard marked for localization in disparate places.
+	 */
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLEST] = nautilus_font_factory_get_font_by_family (_("helvetica"), 8);
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLER] = nautilus_font_factory_get_font_by_family (_("helvetica"), 8);
         details->label_font[NAUTILUS_ZOOM_LEVEL_SMALL] = nautilus_font_factory_get_font_by_family (_("helvetica"), 10);
diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c
index 4e9a92e3a..875d5843d 100644
--- a/libnautilus-private/nautilus-scalable-font.c
+++ b/libnautilus-private/nautilus-scalable-font.c
@@ -300,7 +300,7 @@ nautilus_scalable_font_get_default_font (void)
 	char *default_font_file_name;
 	NautilusScalableFont *default_font;
 
-	/* FIXME bugzilla.eazel.com xxxx:
+	/* FIXME bugzilla.eazel.com 7344:
 	 * Its evil that we have to peek preferences here to
 	 * find the default smooth font, but so it goes.
 	 */
@@ -323,7 +323,7 @@ nautilus_scalable_font_get_default_bold_font (void)
 	char *default_bold_font_file_name;
 	NautilusScalableFont *default_bold_font;
 
-	/* FIXME bugzilla.eazel.com xxxx:
+	/* FIXME bugzilla.eazel.com 7344:
 	 * Its evil that we have to peek preferences here to
 	 * find the default smooth font, but so it goes.
 	 */