From d94ca97ed14dfa566bed850db28d63f93c7cf1b2 Mon Sep 17 00:00:00 2001
From: lclausen <lclausen>
Date: Tue, 4 Apr 2006 03:09:42 +0000
Subject: [PATCH] xfig import text placement, better GTK check.

---
 ChangeLog                   | 16 ++++++++++++++++
 app/Makefile.am             |  6 ++++--
 plug-ins/xfig/xfig-import.c |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 447e1446..815499c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03  Lars Clausen  <lars@raeder.dk>
+
+	* plug-ins/xfig/xfig-import.c: Initially place text in the right
+	place. 
+
 2006-04-03  Steffen Macke <sdteffen@gmail.com>
 
 	* installer/win32/dia.nsi:
@@ -16,6 +21,17 @@
 
 2006-03-28  Lars Clausen  <lars@raeder.dk>
 
+	* app/Makefile.am (dia_LDADD): Patch from Peter for bug #336377:
+	Include libs and cflags in proper places.
+
+	* installer/win32/dia.nsi: 
+	* doc/en/dia.xml: 
+	* doc/eu/dia.xml: 
+	* doc/pl/dia.xml: 
+	* config.h.win32: 
+	* configure.in: 
+	* NEWS: -pre7
+
 	* shapes/network/mobile_phone.{png,xpm,shape}:
 	* shapes/network/telephone.shape:
 	* shapes/network/disc.shape:
diff --git a/app/Makefile.am b/app/Makefile.am
index 01159007..4d58ddea 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -8,12 +8,14 @@ INCLUDES = \
 	-I$(top_srcdir)/lib \
 	$(DEBUG_FLAGS) \
 	$(GTK_CFLAGS) \
+	$(LIBART_CFLAGS) \
         -DPREFIX=\""$(prefix)"\" \
         -DSYSCONFDIR=\""$(sysconfdir)"\" \
         -DDATADIR=\""$(datadir)"\" \
         -DLIBDIR=\""$(libdir)"\" \
 	-DLOCALEDIR=\"$(localedir)\"
 
+
 print_files = \
 	paginate_psprint.c \
 	paginate_psprint.h
@@ -70,7 +72,7 @@ ICON_PNGS= \
 	pixmaps/ungroup.png \
 	pixmaps/mainpoints-on.png \
 	pixmaps/mainpoints-off.png
-	
+
 
 dia-app-icons.h: $(ICON_PNGS)
 	gdk-pixbuf-csource --raw --build-list $(ICON_PNG_PAIRS) > dia-app-icons.h
@@ -212,7 +214,7 @@ EFENCE =
 
 dia_LDADD = ../lib/libdia.la \
 	$(EFENCE) \
-	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
+	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS) $(XML_LIBS) $(LIBART_LIBS) $(GLIB_LIBS)
 
 #diaconv_LDADD = ../lib/libdia.la \
 #	$(EFENCE) \
diff --git a/plug-ins/xfig/xfig-import.c b/plug-ins/xfig/xfig-import.c
index 0a9f143d..5d1e9792 100644
--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -1296,7 +1296,7 @@ fig_read_text(FILE *file, DiagramData *dia) {
     /* Skip one space exactly */
     text_buf = fig_read_text_line(file);
 
-    newobj = create_standard_text(x, y, dia);
+    newobj = create_standard_text(x/FIG_UNIT, y/FIG_UNIT, dia);
     if (newobj == NULL) goto exit;
 
     props = prop_list_from_descs(xfig_text_descs,pdtpp_true);
-- 
2.11.4.GIT