diff options
| author | Jon Phillips <jon@fabricatorz.com> | 2007-08-14 07:22:11 +0000 |
|---|---|---|
| committer | kidproto <kidproto@users.sourceforge.net> | 2007-08-14 07:22:11 +0000 |
| commit | 3747e59f8cf5d93ee18cf4e0c9fd518ed09361fd (patch) | |
| tree | 631363f14eef7559b11ecd0cf44b11979a4b2803 /src/xml | |
| parent | Filter effects dialog: (diff) | |
| download | inkscape-3747e59f8cf5d93ee18cf4e0c9fd518ed09361fd.tar.gz inkscape-3747e59f8cf5d93ee18cf4e0c9fd518ed09361fd.zip | |
Applied patches for default metadata and for fix on creative commons namespace.
(bzr r3464)
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/repr-util.cpp | 10 | ||||
| -rw-r--r-- | src/xml/repr.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 42b957d43..693558cf7 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -149,7 +149,7 @@ static SPXMLNs *namespaces=NULL; static void sp_xml_ns_register_defaults() { - static SPXMLNs defaults[9]; + static SPXMLNs defaults[10]; defaults[0].uri = g_quark_from_static_string(SP_SODIPODI_NS_URI); defaults[0].prefix = g_quark_from_static_string("sodipodi"); @@ -194,7 +194,13 @@ sp_xml_ns_register_defaults() defaults[8].uri = g_quark_from_static_string("http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"); defaults[8].prefix = g_quark_from_static_string("sodipodi"); - defaults[8].next = NULL; + defaults[8].next = &defaults[9]; + + // This namespace URI is being phased out by Creative Commons + + defaults[9].uri = g_quark_from_static_string(SP_OLD_CC_NS_URI); + defaults[9].prefix = g_quark_from_static_string("cc"); + defaults[9].next = NULL; namespaces = &defaults[0]; } diff --git a/src/xml/repr.h b/src/xml/repr.h index 89221656a..23786d3b8 100644 --- a/src/xml/repr.h +++ b/src/xml/repr.h @@ -27,7 +27,8 @@ #define SP_XLINK_NS_URI "http://www.w3.org/1999/xlink" #define SP_SVG_NS_URI "http://www.w3.org/2000/svg" #define SP_RDF_NS_URI "http://www.w3.org/1999/02/22-rdf-syntax-ns#" -#define SP_CC_NS_URI "http://web.resource.org/cc/" +#define SP_CC_NS_URI "http://creativecommons.org/ns#" +#define SP_OLD_CC_NS_URI "http://web.resource.org/cc/" #define SP_DC_NS_URI "http://purl.org/dc/elements/1.1/" /** |