Reference glabels.org website

Change all references to the glabels.sourceforge.net website to the
glabels.org alias.  Change namespace for 2.3 development version to
glabels.org/xmlns/2.3/.

diff --git a/MESSAGE-OF-DOOM b/MESSAGE-OF-DOOM
index 9ddbfaa766c09ada2a4060f1a7d52ca007c9883c..59f90e5360c295ddecefd23cd5a12045b57aeba2 100644 (file)
--- a/MESSAGE-OF-DOOM
+++ b/MESSAGE-OF-DOOM
@@ -8,7 +8,7 @@ It will probably crash and you will lose your data.
 
 If you are looking for a stable release of glabels, it can be downloaded from:
 
-  http://glabels.sourceforge.net/download
+  http://glabels.org/download
 
  *** END OF WARNING ***
 

diff --git a/README b/README
index bd9a270c4b2a0f1fca8dd422c30c9be3a3763781..aadf245344611c323d15bad80900e2babdf29e63 100644 (file)
--- a/README
+++ b/README
@@ -51,5 +51,5 @@ See the AUTHORS file.
 Website
 =======
 
-http://glabels.sourceforge.net/
+http://glabels.org/
 

diff --git a/data/man/glabels.1 b/data/man/glabels.1
index 489b2a422350fc1e35368517decc149c5aaae47f..906dd2a571aed456c58b61beef6977c3a51b9ae1 100644 (file)
--- a/data/man/glabels.1
+++ b/data/man/glabels.1
@@ -62,6 +62,6 @@ seen from the back through glass.
 .SH FILES
 The $HOME/.glabels directory contains all user-defined templates.
 .SH SEE ALSO
-The gLabels homepage at <http://glabels.sourceforge.net/>.
+The gLabels homepage at <http://glabels.org/>.
 .SH AUTHOR
 Jim Evins <evins@snaught.com>

diff --git a/glabels.doap b/glabels.doap
index 56c5a9be35c2c0a017d498a630648737bce48814..a2c00a8d7de323082082011d197557107a7d2b10 100644 (file)
--- a/glabels.doap
+++ b/glabels.doap
@@ -6,7 +6,7 @@
 
   <name xml:lang="en">glabels</name>
   <shortdesc xml:lang="en">gLabels label designer</shortdesc>
-  <homepage rdf:resource="http://glabels.sourceforge.net" />
+  <homepage rdf:resource="http://glabels.org" />
   <mailing-list rdf:resource="https://lists.sourceforge.net/lists/listinfo/glabels-devel" />
   <category rdf:resource="http://api.gnome.org/doap-extensions#productivity" />
 

diff --git a/libglabels/xml.h b/libglabels/xml.h
index 4629cfe0941cd2f41c7cb83827584fff013c8ce3..8b5ba9dd53d7e5de6f20715e4b831185d16846f8 100644 (file)
--- a/libglabels/xml.h
+++ b/libglabels/xml.h
@@ -26,7 +26,7 @@
 
 #include "units.h"
 
-#define LGL_XML_NAME_SPACE "http://snaught.com/glabels/2.2/"
+#define LGL_XML_NAME_SPACE "http://glabels.org/xmlns/2.3/"
 
 G_BEGIN_DECLS
 

diff --git a/src/ui-commands.c b/src/ui-commands.c
index 73da051edfa67abed91d1436d8ede7eb79e71b9c..a29f18e69dd42f160d92d488cd0baa07cf84cbd5 100644 (file)
--- a/src/ui-commands.c
+++ b/src/ui-commands.c
@@ -1101,7 +1101,7 @@ gl_ui_cmd_help_about (GtkAction *action,
                 "Austin Henry",
                 " ",
                 _("See the file AUTHORS for additional credits,"),
-                _("or visit http://glabels.sourceforge.net/"),
+                _("or visit http://glabels.org/"),
                 NULL
         };
         
@@ -1115,7 +1115,7 @@ gl_ui_cmd_help_about (GtkAction *action,
 
         const gchar *about_text = _("A label and business card creation program.\n");
 
-        const gchar *url = "http://glabels.sourceforge.net";
+        const gchar *url = "http://glabels.org";
 
         const gchar *translator_credits = _("translator-credits");
 

diff --git a/src/xml-label.c b/src/xml-label.c
index 616aea51f3c7f6b8d76ec92721db7748154da7c5..cf3c436a5b704b8a36c620e9f39045fc9086ee00 100644 (file)
--- a/src/xml-label.c
+++ b/src/xml-label.c
@@ -51,6 +51,7 @@
 #define COMPAT01_NAME_SPACE "http://snaught.com/glabels/0.1/"
 #define COMPAT04_NAME_SPACE "http://snaught.com/glabels/0.4/"
 #define COMPAT20_NAME_SPACE "http://snaught.com/glabels/2.0/"
+#define COMPAT22_NAME_SPACE "http://snaught.com/glabels/2.2/"
 
 
 /*========================================================*/
@@ -284,6 +285,7 @@ xml_doc_to_label (xmlDocPtr         doc,
 
         /* Test for current namespaces. */
         if ( !xmlSearchNsByHref (doc, root, (xmlChar *)COMPAT20_NAME_SPACE) &&
+             !xmlSearchNsByHref (doc, root, (xmlChar *)COMPAT22_NAME_SPACE) &&
              !xmlSearchNsByHref (doc, root, (xmlChar *)LGL_XML_NAME_SPACE) )
         {
                 g_message (_("Unknown glabels Namespace -- Using %s"),