* all: changed dtd version to 1.99 before the final dtd freeze

diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp
index 5ecedcedadfcfe8ce75d39a19130de93db91a289..bf609f6ff3e5b5c5cd30e4bedb12da4dd56ce462 100644 (file)
--- a/modules/gui/skins2/parser/skin_parser.cpp
+++ b/modules/gui/skins2/parser/skin_parser.cpp
@@ -2,7 +2,7 @@
  * skin_parser.cpp
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: skin_parser.cpp,v 1.3 2004/03/01 18:33:31 asmax Exp $
+ * $Id: skin_parser.cpp,v 1.4 2004/03/01 19:36:43 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *
@@ -25,7 +25,7 @@
 #include <math.h>
 
 // Current DTD version
-#define SKINS_DTD_VERSION "2.0"
+#define SKINS_DTD_VERSION "1.99"
 
 
 SkinParser::SkinParser( intf_thread_t *pIntf, const string &rFileName ):
@@ -177,6 +177,8 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
         {
             msg_Err( getIntf(), "Bad theme version : %s (you need version %s)",
                      attr["version"], SKINS_DTD_VERSION );
+            m_errors = true;
+            return;
         }
         const BuilderData::Theme theme( atoi( attr["magnet"] ),
                 atoi( attr["alpha"] ), atoi( attr["movealpha"] ),

diff --git a/modules/gui/skins2/parser/xmlparser.hpp b/modules/gui/skins2/parser/xmlparser.hpp
index 5c3c00e5f8dcbd5028438a870c2c92a06e22900e..d57696266eeae2762cc708d13f1fbd8fb29d9198 100644 (file)
--- a/modules/gui/skins2/parser/xmlparser.hpp
+++ b/modules/gui/skins2/parser/xmlparser.hpp
@@ -2,7 +2,7 @@
  * xmlparser.hpp
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: xmlparser.hpp,v 1.5 2004/02/27 15:07:04 gbazin Exp $
+ * $Id: xmlparser.hpp,v 1.6 2004/03/01 19:36:43 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *
@@ -50,6 +50,9 @@ class XMLParser: public SkinObject
         /// Type for attribute lists
         typedef map<const char*, const char*, ltstr> AttrList_t;
 
+        /// Flag for validation errors
+        bool m_errors;
+
         /// Callbacks
         virtual void handleBeginElement( const string &rName, AttrList_t &attr ) {}
         virtual void handleEndElement( const string &rName ) {}
@@ -57,8 +60,6 @@ class XMLParser: public SkinObject
     private:
         /// Reader context
         xmlTextReaderPtr m_pReader;
-        /// Flag for validation errors
-        bool m_errors;
 
         /// Callback for validation errors
         static void handleError( void *pArg,  const char *pMsg,

diff --git a/modules/gui/skins2/theme/skin.dtd b/modules/gui/skins2/theme/skin.dtd
index e0180c73264faf28d98d85fe304653c0d55e613a..1f05cb046bdc485e8879ebe583520350f2d3334e 100644 (file)
--- a/modules/gui/skins2/theme/skin.dtd
+++ b/modules/gui/skins2/theme/skin.dtd
@@ -1,4 +1,4 @@
-<!--
+<!-- version 1.99
 -->
 
 

diff --git a/modules/gui/skins2/theme/theme.xml b/modules/gui/skins2/theme/theme.xml
index 6d106b04962b0d1c3030feb1e6645525bc83639f..997be97a40e375cf87e482a2953aa22af4328d83 100644 (file)
--- a/modules/gui/skins2/theme/theme.xml
+++ b/modules/gui/skins2/theme/theme.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE Theme SYSTEM "skin.dtd">\r
 \r
-<Theme version="2.0" magnet="20" alpha="255" movealpha="192" fadetime="500">\r
+<Theme version="1.99" magnet="20" alpha="255" movealpha="192" fadetime="500">\r
   <ThemeInfo name="VLC OSX Interface" author="BigBen"\r
              email="bigben@videolan.org" webpage="http://www.videolan.org"/>\r
 \r