dia r4312 - in trunk: . lib plug-ins/shape

[hans svn gnome org]

Author: hans
Date: Sun Mar  8 17:03:47 2009
New Revision: 4312
URL: http://svn.gnome.org/viewvc/dia?rev=4312&view=rev

Log:
2009-03-08  Hans Breuer  <hans breuer org>

	* lib/dia_xml_libxml.h lib/dia_xml.[ch] lib/prop_geomtypes.h
	  plug-ins/shape/shape-export.c : removed some cruft from lixml1 
	days while investigating bug #570592
	* config.h.win32 : insignificant changes slightly related bug #570592



Modified:
   trunk/ChangeLog
   trunk/config.h.win32
   trunk/lib/dia_xml.c
   trunk/lib/dia_xml_libxml.h
   trunk/lib/prop_geomtypes.h
   trunk/plug-ins/shape/shape-export.c

Modified: trunk/config.h.win32
==============================================================================
--- trunk/config.h.win32	(original)
+++ trunk/config.h.win32	Sun Mar  8 17:03:47 2009
@@ -18,6 +18,13 @@
 #undef LOCALEDIR /* needs to be calculated at runtime */
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
+/* some non critical defines */
+#if 0
+#define HAVE_LIBART
+#define HAVE_LIBPNG
+#endif
+#define HAVE_LIBZ
+
 #define VERSION "0.97-pre2"
 
 /*

Modified: trunk/lib/dia_xml.c
==============================================================================
--- trunk/lib/dia_xml.c	(original)
+++ trunk/lib/dia_xml.c	Sun Mar  8 17:03:47 2009
@@ -117,9 +117,9 @@
   {0x3c,0x3f,0x78,0x6d,0x6c,0x00}; /* "<?xml" in ASCII */
 
   if (!zf) {
-    /*    message_error(_("The file %s can not be opened for reading"),filename); */ 
-    /* XXX perhaps we can just chicken out to libxml ? -- CC */ 
-    return NULL;
+    dia_log_message("%s can not be opened for encoding check (%s)", filename, fd > 0 ? "gzdopen" : "g_open");
+    /* XXX perhaps we can just chicken out to libxml ? -- CC */
+    return filename;
   }
   p = buf = g_malloc0(BUFLEN);  
   len = gzread(zf,buf,BUFLEN);
@@ -1197,18 +1197,6 @@
   return data_node;
 }
 
-/** Emit a warning to the user that having UTF-8 as local charset doesn't.
- */
-void 
-warn_about_broken_libxml1(void) 
-{
-  message_warning(_("Your local character set is UTF-8. Because of issues"
-                    " with libxml1 and the support of files generated by"
-                    " previous versions of dia, you will encounter "
-                    " problems. Please report to dia-list gnome org if you"
-                    " see this message."));
-}
-
 #define BUFSIZE 2048
 #define OVERRUN_SAFETY 16
 

Modified: trunk/lib/dia_xml_libxml.h
==============================================================================
--- trunk/lib/dia_xml_libxml.h	(original)
+++ trunk/lib/dia_xml_libxml.h	Sun Mar  8 17:03:47 2009
@@ -23,7 +23,6 @@
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
-#include "dia_xml.h"
 
 /* for potentially broken files */
 xmlDocPtr xmlDiaParseFile(const char *filename); 
@@ -31,8 +30,6 @@
 /* use this one instead of xmlParseFile */
 xmlDocPtr xmlDoParseFile(const char *filename); 
 
-void warn_about_broken_libxml1(void);
-
 /* use this instead of xmlSaveFile/xmlSaveFileEnc. Set the encoding to
    UTF-8 at the very beginning ! */
 int xmlDiaSaveFile(const char *filename,

Modified: trunk/lib/prop_geomtypes.h
==============================================================================
--- trunk/lib/prop_geomtypes.h	(original)
+++ trunk/lib/prop_geomtypes.h	Sun Mar  8 17:03:47 2009
@@ -26,8 +26,6 @@
 #define PROP_GEOMTYPES_H
 
 #include "properties.h"
-#include "libxml/tree.h"
-#include "dia_xml.h"
 #include "geometry.h"
 
 typedef struct {

Modified: trunk/plug-ins/shape/shape-export.c
==============================================================================
--- trunk/plug-ins/shape/shape-export.c	(original)
+++ trunk/plug-ins/shape/shape-export.c	Sun Mar  8 17:03:47 2009
@@ -50,6 +50,7 @@
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h> /* xmlStrdup */
+#include "dia_xml.h"
 #include "dia_xml_libxml.h"
 #include "geometry.h"
 #include "diasvgrenderer.h"