diff -u -r dia-0.96.1-fix/plug-ins/pgf/render_pgf.c dia-0.96.1/plug-ins/pgf/render_pgf.c
--- dia-0.96.1-fix/plug-ins/pgf/render_pgf.c	2007-10-01 15:28:28.410421108 +0200
+++ dia-0.96.1/plug-ins/pgf/render_pgf.c	2007-03-18 20:49:15.000000000 +0100
@@ -72,9 +72,6 @@
 #include "filter.h"
 #include "arrows.h"
 
-#include "text.h"
-#include "textline.h"
-
 #define POINTS_in_INCH 28.346
 #define DTOSTR_BUF_SIZE G_ASCII_DTOSTR_BUF_SIZE
 #define pgf_dtostr(buf,d) \
@@ -144,8 +141,6 @@
 			BezPoint *points, /* Last point must be same as first point */
 			int numpoints,
 			Color *color);
-static void draw_text(DiaRenderer *renderer,
-                      Text *text);
 static void draw_string(DiaRenderer *self,
 			const char *text,
 			Point *pos, Alignment alignment,
@@ -292,7 +287,6 @@
   orig_draw_bezier_with_arrows = renderer_class->draw_bezier_with_arrows;
   renderer_class->draw_bezier_with_arrows = draw_bezier_with_arrows;
   
-  renderer_class->draw_text = draw_text;
   renderer_class->draw_string = draw_string;
 
   renderer_class->draw_image = draw_image;
@@ -1097,7 +1091,7 @@
 
 
 
-#ifdef I_REALLY_WANT_TO_ESCAPE_TEX
+
 
 /* Do we really want to do this?  What if the text is intended as 
  * TeX text?  Jacek says leave it as a TeX string.  TeX uses should know
@@ -1146,37 +1140,6 @@
     return p;
 }
 
-#else
-
-/* Just do nothing */
-
-#define tex_escape_string g_strdup
-
-#endif
-
-
-/* The default implementation forces left alignement... */
-static void
-draw_text(DiaRenderer *renderer,
-          Text *text)
-{
-  Point pos;
-  int i;
-
-  pos = text->position;
-  
-  for (i=0;i<text->numlines;i++) {
-    Point aligned_pos = pos;
-    TextLine *text_line = text->lines[i];
-
-    draw_string(renderer,text_line_get_string(text_line),
-                &aligned_pos, text->alignment, &text->color);
-
-    pos.y += text->height;
-  }
-}
-
-
 static void
 draw_string(DiaRenderer *self,
 	    const char *text,
@@ -1275,8 +1238,8 @@
 	
 	"\\ifx\\du\\undefined\n"
   	"  \\newlength{\\du}\n"
-	"  \\setlength{\\du}{15\\unitlength}\n"
 	"\\fi\n"
+	"\\setlength{\\du}{15\\unitlength}\n"
 	"\\begin{tikzpicture}\n",
 	diafilename,
 	VERSION,
diff -u -r dia-0.96.1-fix/plug-ins/pstricks/render_pstricks.c dia-0.96.1/plug-ins/pstricks/render_pstricks.c
--- dia-0.96.1-fix/plug-ins/pstricks/render_pstricks.c	2007-10-01 14:14:45.143848959 +0200
+++ dia-0.96.1/plug-ins/pstricks/render_pstricks.c	2007-03-18 20:49:15.000000000 +0100
@@ -714,9 +714,6 @@
     pstricks_bezier(renderer,points,numpoints,color,TRUE);
 }
 
-#ifdef I_REALLY_WANT_TO_ESCAPE_TEX
-
-
 /* Do we really want to do this?  What if the text is intended as 
  * TeX text?  Jacek says leave it as a TeX string.  TeX uses should know
  * how to escape stuff anyway.  Later versions will get an export option.
@@ -764,15 +761,6 @@
     return p;
 }
 
-#else
-
-/* Just do nothing */
-
-#define tex_escape_string g_strdup
-
-#endif
-
-
 static void
 draw_string(DiaRenderer *self,
 	    const char *text,
