Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	8 Feb 2005 16:39:18 -0000	1.3
+++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	15 Jun 2005 18:46:57 -0000	1.3.2.1
@@ -40,7 +40,7 @@
 } {
     set convert_p [string length [exec find /usr/local/bin -name convert]]
     set freetype_p [string length [exec whereis freetype]]
-    if { $convert_p != 0 && $freetype_p != 0 } {
+    if { $convert_p != 0 && $freetype_p != 9 } {
 	return 1
     } else {
 	return 0
@@ -91,7 +91,11 @@
     
 		} else {
 		    # Create a new email_image
-		    set email_image [email_image::new_item -user_id $user_id -bgcolor $bgcolor -transparent $transparent]
+		    if { [catch { set email_image [email_image::new_item -user_id $user_id -bgcolor $bgcolor -transparent $transparent] } errmsg ] } {
+                        set email_user [lindex [split $email '@'] 0]
+                        set email_domain [lindex [split $email '@'] 1]
+                        set email_image "<a href=\"/shared/send-email?sendto=$user_id&return_url=$return_url\">${email_user}<img border=0 align=middle src=/shared/images/at.gif>${email_domain}</a>"
+                    }
 		}
 	    } else {
 		# ImageMagick not present, we protect the email by adding