GNOME.org
 

[glabels] Renamed libglabels source files to have "lgl-" prefix.

commit 5c6f4d559896d7290d8877651d60010eefc1c6bb
Author: Jim Evins <evins snaught com>
Date:   Sat Dec 18 23:11:04 2010 -0500

    Renamed libglabels source files to have "lgl-" prefix.
    
    Improve odds that source files (headers in particular) remain
    unique.

 docs/libglabels/libglabels-3.0-sections.txt       |   24 ++++----
 libglabels/Makefile.am                            |   72 ++++++++++----------
 libglabels/{category.c => lgl-category.c}         |    6 +-
 libglabels/{category.h => lgl-category.h}         |    4 +-
 libglabels/{db.c => lgl-db.c}                     |   14 ++--
 libglabels/{db.h => lgl-db.h}                     |   12 ++--
 libglabels/{paper.c => lgl-paper.c}               |    6 +-
 libglabels/{paper.h => lgl-paper.h}               |    4 +-
 libglabels/{str.c => lgl-str.c}                   |    6 +-
 libglabels/{str.h => lgl-str.h}                   |    4 +-
 libglabels/{template.c => lgl-template.c}         |   10 ++--
 libglabels/{template.h => lgl-template.h}         |    6 +-
 libglabels/{units.c => lgl-units.c}               |    6 +-
 libglabels/{units.h => lgl-units.h}               |    4 +-
 libglabels/{vendor.c => lgl-vendor.c}             |    6 +-
 libglabels/{vendor.h => lgl-vendor.h}             |    4 +-
 libglabels/{xml-category.c => lgl-xml-category.c} |    8 +-
 libglabels/{xml-category.h => lgl-xml-category.h} |    6 +-
 libglabels/{xml-paper.c => lgl-xml-paper.c}       |    8 +-
 libglabels/{xml-paper.h => lgl-xml-paper.h}       |    6 +-
 libglabels/{xml-template.c => lgl-xml-template.c} |   10 ++--
 libglabels/{xml-template.h => lgl-xml-template.h} |    6 +-
 libglabels/{xml-vendor.c => lgl-xml-vendor.c}     |    8 +-
 libglabels/{xml-vendor.h => lgl-xml-vendor.h}     |    6 +-
 libglabels/{xml.c => lgl-xml.c}                   |    6 +-
 libglabels/{xml.h => lgl-xml.h}                   |    6 +-
 libglabels/libglabels-private.h                   |    4 +-
 libglabels/libglabels.h                           |   20 +++---
 po/POTFILES.in                                    |   40 ++++++------
 29 files changed, 161 insertions(+), 161 deletions(-)
---
diff --git a/docs/libglabels/libglabels-3.0-sections.txt b/docs/libglabels/libglabels-3.0-sections.txt
index 5323ab0..7efab0c 100644
--- a/docs/libglabels/libglabels-3.0-sections.txt
+++ b/docs/libglabels/libglabels-3.0-sections.txt
@@ -1,6 +1,6 @@
 <SECTION>
 <FILE>db</FILE>
-<INCLUDE>libglabels/db.h</INCLUDE>
+<INCLUDE>libglabels/lgl-db.h</INCLUDE>
 lglDbRegStatus
 lglDbDeleteStatus
 <SUBSECTION Init Functions>
@@ -58,7 +58,7 @@ lgl_db_print_known_vendors
 
 <SECTION>
 <FILE>template</FILE>
-<INCLUDE>libglabels/template.h</INCLUDE>
+<INCLUDE>libglabels/lgl-template.h</INCLUDE>
 lglTemplate
 <SUBSECTION Frame Structure>
 lglTemplateFrameShape
@@ -127,7 +127,7 @@ lgl_template_print
 
 <SECTION>
 <FILE>paper</FILE>
-<INCLUDE>libglabels/paper.h</INCLUDE>
+<INCLUDE>libglabels/lgl-paper.h</INCLUDE>
 lglPaper
 lgl_paper_new
 lgl_paper_dup
@@ -136,7 +136,7 @@ lgl_paper_free
 
 <SECTION>
 <FILE>category</FILE>
-<INCLUDE>libglabels/category.h</INCLUDE>
+<INCLUDE>libglabels/lgl-category.h</INCLUDE>
 lglCategory
 lgl_category_new
 lgl_category_dup
@@ -145,7 +145,7 @@ lgl_category_free
 
 <SECTION>
 <FILE>vendor</FILE>
-<INCLUDE>libglabels/vendor.h</INCLUDE>
+<INCLUDE>libglabels/lgl-vendor.h</INCLUDE>
 lglVendor
 lgl_vendor_new
 lgl_vendor_dup
@@ -154,7 +154,7 @@ lgl_vendor_free
 
 <SECTION>
 <FILE>xml-paper</FILE>
-<INCLUDE>libglabels/xml-paper.h</INCLUDE>
+<INCLUDE>libglabels/lgl-xml-paper.h</INCLUDE>
 lgl_xml_paper_read_papers_from_file
 lgl_xml_paper_parse_papers_doc
 lgl_xml_paper_parse_paper_node
@@ -162,7 +162,7 @@ lgl_xml_paper_parse_paper_node
 
 <SECTION>
 <FILE>xml-category</FILE>
-<INCLUDE>libglabels/xml-category.h</INCLUDE>
+<INCLUDE>libglabels/lgl-xml-category.h</INCLUDE>
 lgl_xml_category_read_categories_from_file
 lgl_xml_category_parse_categories_doc
 lgl_xml_category_parse_category_node
@@ -170,7 +170,7 @@ lgl_xml_category_parse_category_node
 
 <SECTION>
 <FILE>xml-template</FILE>
-<INCLUDE>libglabels/xml-templates.h</INCLUDE>
+<INCLUDE>libglabels/lgl-xml-templates.h</INCLUDE>
 lgl_xml_template_read_templates_from_file
 lgl_xml_template_parse_templates_doc
 lgl_xml_template_parse_template_node
@@ -181,7 +181,7 @@ lgl_xml_template_create_template_node
 
 <SECTION>
 <FILE>xml-vendor</FILE>
-<INCLUDE>libglabels/xml-vendor.h</INCLUDE>
+<INCLUDE>libglabels/lgl-xml-vendor.h</INCLUDE>
 lgl_xml_vendor_read_vendors_from_file
 lgl_xml_vendor_parse_vendors_doc
 lgl_xml_vendor_parse_vendor_node
@@ -189,7 +189,7 @@ lgl_xml_vendor_parse_vendor_node
 
 <SECTION>
 <FILE>xml</FILE>
-<INCLUDE>libglabels/xml.h</INCLUDE>
+<INCLUDE>libglabels/lgl-xml.h</INCLUDE>
 LGL_XML_NAME_SPACE
 <SUBSECTION Get Property Functions>
 lgl_xml_get_prop_string
@@ -215,7 +215,7 @@ lgl_xml_set_default_units
 
 <SECTION>
 <FILE>units</FILE>
-<INCLUDE>libglabels/units.h</INCLUDE>
+<INCLUDE>libglabels/lgl-units.h</INCLUDE>
 lglUnits
 lgl_units_get_id
 lgl_units_from_id
@@ -227,7 +227,7 @@ lgl_units_get_units_per_point
 
 <SECTION>
 <FILE>str</FILE>
-<INCLUDE>libglabels/str.h</INCLUDE>
+<INCLUDE>libglabels/lgl-str.h</INCLUDE>
 lgl_str_utf8_casecmp
 lgl_str_part_name_cmp
 lgl_str_format_fraction
diff --git a/libglabels/Makefile.am b/libglabels/Makefile.am
index 4d43f5c..f901346 100644
--- a/libglabels/Makefile.am
+++ b/libglabels/Makefile.am
@@ -12,32 +12,32 @@ libglabels_3_0_la_LDFLAGS=\
 
 lib_LTLIBRARIES = libglabels-3.0.la
 
-libglabels_3_0_la_SOURCES =		\
+libglabels_3_0_la_SOURCES =	\
 	libglabels-private.h	\
-	db.h			\
-	db.c			\
-	units.h			\
-	units.c			\
-	paper.h			\
-	paper.c			\
-	category.h		\
-	category.c		\
-	vendor.h		\
-	vendor.c		\
-	template.h		\
-	template.c		\
-	xml-paper.h		\
-	xml-paper.c		\
-	xml-category.h		\
-	xml-category.c		\
-	xml-vendor.h		\
-	xml-vendor.c		\
-	xml-template.h		\
-	xml-template.c		\
-	xml.h			\
-	xml.c			\
-	str.h			\
-	str.c
+	lgl-db.h		\
+	lgl-db.c		\
+	lgl-units.h		\
+	lgl-units.c		\
+	lgl-paper.h		\
+	lgl-paper.c		\
+	lgl-category.h		\
+	lgl-category.c		\
+	lgl-vendor.h		\
+	lgl-vendor.c		\
+	lgl-template.h		\
+	lgl-template.c		\
+	lgl-xml-paper.h		\
+	lgl-xml-paper.c		\
+	lgl-xml-category.h	\
+	lgl-xml-category.c	\
+	lgl-xml-vendor.h	\
+	lgl-xml-vendor.c	\
+	lgl-xml-template.h	\
+	lgl-xml-template.c	\
+	lgl-xml.h		\
+	lgl-xml.c		\
+	lgl-str.h		\
+	lgl-str.c
 
 libglabels_3_0includedir=$(includedir)/$(LIBGLABELS_BRANCH)
 
@@ -46,17 +46,17 @@ libglabels_3_0include_HEADERS = 	\
 
 libglabels_3_0subincludedir=$(includedir)/$(LIBGLABELS_BRANCH)/libglabels
 
-libglabels_3_0subinclude_HEADERS = 	\
-	db.h                    \
-	units.h			\
-	paper.h			\
-	category.h		\
-	template.h		\
-	xml-paper.h		\
-	xml-category.h		\
-	xml-template.h		\
-	xml.h			\
-	str.h			
+libglabels_3_0subinclude_HEADERS =  \
+	lgl-db.h                \
+	lgl-units.h		\
+	lgl-paper.h		\
+	lgl-category.h		\
+	lgl-template.h		\
+	lgl-xml-paper.h		\
+	lgl-xml-category.h	\
+	lgl-xml-template.h	\
+	lgl-xml.h		\
+	lgl-str.h			
 
 EXTRA_DIST =			\
 	$(LIBGLABELS_BRANCH).pc.in
diff --git a/libglabels/category.c b/libglabels/lgl-category.c
similarity index 96%
rename from libglabels/category.c
rename to libglabels/lgl-category.c
index f7f4052..a733535 100644
--- a/libglabels/category.c
+++ b/libglabels/lgl-category.c
@@ -1,6 +1,6 @@
 /*
- *  category.c
- *  Copyright (C) 2006-2009  Jim Evins <evins snaught com>.
+ *  lgl-category.c
+ *  Copyright (C) 2006-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "category.h"
+#include "lgl-category.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
diff --git a/libglabels/category.h b/libglabels/lgl-category.h
similarity index 95%
rename from libglabels/category.h
rename to libglabels/lgl-category.h
index b62b906..8ac3536 100644
--- a/libglabels/category.h
+++ b/libglabels/lgl-category.h
@@ -1,6 +1,6 @@
 /*
- *  category.h
- *  Copyright (C) 2006-2009  Jim Evins <evins snaught com>.
+ *  lgl-category.h
+ *  Copyright (C) 2006-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
diff --git a/libglabels/db.c b/libglabels/lgl-db.c
similarity index 99%
rename from libglabels/db.c
rename to libglabels/lgl-db.c
index daf914c..fed3aee 100644
--- a/libglabels/db.c
+++ b/libglabels/lgl-db.c
@@ -1,6 +1,6 @@
 /*
- *  db.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-db.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "db.h"
+#include "lgl-db.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
@@ -32,10 +32,10 @@
 
 #include "libglabels-private.h"
 
-#include "xml-paper.h"
-#include "xml-category.h"
-#include "xml-vendor.h"
-#include "xml-template.h"
+#include "lgl-xml-paper.h"
+#include "lgl-xml-category.h"
+#include "lgl-xml-vendor.h"
+#include "lgl-xml-template.h"
 
 /*===========================================*/
 /* Private macros and constants.             */
diff --git a/libglabels/db.h b/libglabels/lgl-db.h
similarity index 97%
rename from libglabels/db.h
rename to libglabels/lgl-db.h
index bcba326..a505e62 100644
--- a/libglabels/db.h
+++ b/libglabels/lgl-db.h
@@ -1,6 +1,6 @@
 /*
- *  db.h
- *  Copyright (C) 2006-2009  Jim Evins <evins snaught com>.
+ *  lgl-db.h
+ *  Copyright (C) 2006-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -23,10 +23,10 @@
 
 #include <glib.h>
 
-#include "paper.h"
-#include "category.h"
-#include "vendor.h"
-#include "template.h"
+#include "lgl-paper.h"
+#include "lgl-category.h"
+#include "lgl-vendor.h"
+#include "lgl-template.h"
 
 G_BEGIN_DECLS
 
diff --git a/libglabels/paper.c b/libglabels/lgl-paper.c
similarity index 97%
rename from libglabels/paper.c
rename to libglabels/lgl-paper.c
index d0b80fb..43cca91 100644
--- a/libglabels/paper.c
+++ b/libglabels/lgl-paper.c
@@ -1,6 +1,6 @@
 /*
- *  paper.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-paper.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "paper.h"
+#include "lgl-paper.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
diff --git a/libglabels/paper.h b/libglabels/lgl-paper.h
similarity index 96%
rename from libglabels/paper.h
rename to libglabels/lgl-paper.h
index 46a7a64..ecb5b8e 100644
--- a/libglabels/paper.h
+++ b/libglabels/lgl-paper.h
@@ -1,6 +1,6 @@
 /*
- *  paper.h
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-paper.h
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
diff --git a/libglabels/str.c b/libglabels/lgl-str.c
similarity index 98%
rename from libglabels/str.c
rename to libglabels/lgl-str.c
index a9364c7..4618fad 100644
--- a/libglabels/str.c
+++ b/libglabels/lgl-str.c
@@ -1,6 +1,6 @@
 /*
- *  str.c
- *  Copyright (C) 2007-2009  Jim Evins <evins snaught com>.
+ *  lgl-str.c
+ *  Copyright (C) 2007-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "str.h"
+#include "lgl-str.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/libglabels/str.h b/libglabels/lgl-str.h
similarity index 94%
rename from libglabels/str.h
rename to libglabels/lgl-str.h
index b22f13b..3c096b0 100644
--- a/libglabels/str.h
+++ b/libglabels/lgl-str.h
@@ -1,6 +1,6 @@
 /*
- *  str.h
- *  Copyright (C) 2007-2009  Jim Evins <evins snaught com>.
+ *  lgl-str.h
+ *  Copyright (C) 2007-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
diff --git a/libglabels/template.c b/libglabels/lgl-template.c
similarity index 99%
rename from libglabels/template.c
rename to libglabels/lgl-template.c
index b28a6c2..11763dc 100644
--- a/libglabels/template.c
+++ b/libglabels/lgl-template.c
@@ -1,6 +1,6 @@
 /*
- *  template.c
- *  Copyright (C) 2001-2009  Jim Evins <evins snaught com>.
+ *  lgl-template.c
+ *  Copyright (C) 2001-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "template.h"
+#include "lgl-template.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
@@ -31,8 +31,8 @@
 
 #include "libglabels-private.h"
 
-#include "db.h"
-#include "paper.h"
+#include "lgl-db.h"
+#include "lgl-paper.h"
 
 /*===========================================*/
 /* Private macros and constants.             */
diff --git a/libglabels/template.h b/libglabels/lgl-template.h
similarity index 99%
rename from libglabels/template.h
rename to libglabels/lgl-template.h
index 74e50cf..c1439ab 100644
--- a/libglabels/template.h
+++ b/libglabels/lgl-template.h
@@ -1,6 +1,6 @@
 /*
- *  template.h
- *  Copyright (C) 2001-2009  Jim Evins <evins snaught com>.
+ *  lgl-template.h
+ *  Copyright (C) 2001-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -22,7 +22,7 @@
 #define __LGL_TEMPLATE_H__
 
 #include <glib.h>
-#include "units.h"
+#include "lgl-units.h"
 
 G_BEGIN_DECLS
 
diff --git a/libglabels/units.c b/libglabels/lgl-units.c
similarity index 98%
rename from libglabels/units.c
rename to libglabels/lgl-units.c
index e585962..73d243d 100644
--- a/libglabels/units.c
+++ b/libglabels/lgl-units.c
@@ -1,6 +1,6 @@
 /*
- *  units.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-units.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "units.h"
+#include "lgl-units.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
diff --git a/libglabels/units.h b/libglabels/lgl-units.h
similarity index 96%
rename from libglabels/units.h
rename to libglabels/lgl-units.h
index ac3bb0c..b22be07 100644
--- a/libglabels/units.h
+++ b/libglabels/lgl-units.h
@@ -1,6 +1,6 @@
 /*
- *  units.h
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-units.h
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
diff --git a/libglabels/vendor.c b/libglabels/lgl-vendor.c
similarity index 96%
rename from libglabels/vendor.c
rename to libglabels/lgl-vendor.c
index e7f950b..425c1b5 100644
--- a/libglabels/vendor.c
+++ b/libglabels/lgl-vendor.c
@@ -1,6 +1,6 @@
 /*
- *  vendor.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-vendor.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "vendor.h"
+#include "lgl-vendor.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
diff --git a/libglabels/vendor.h b/libglabels/lgl-vendor.h
similarity index 95%
rename from libglabels/vendor.h
rename to libglabels/lgl-vendor.h
index 68b9ff5..fc0be29 100644
--- a/libglabels/vendor.h
+++ b/libglabels/lgl-vendor.h
@@ -1,6 +1,6 @@
 /*
- *  vendor.h
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-vendor.h
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
diff --git a/libglabels/xml-category.c b/libglabels/lgl-xml-category.c
similarity index 97%
rename from libglabels/xml-category.c
rename to libglabels/lgl-xml-category.c
index 4925eba..91822ee 100644
--- a/libglabels/xml-category.c
+++ b/libglabels/lgl-xml-category.c
@@ -1,6 +1,6 @@
 /*
- *  xml-category.c
- *  Copyright (C) 2006-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-category.c
+ *  Copyright (C) 2006-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "xml-category.h"
+#include "lgl-xml-category.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
@@ -29,7 +29,7 @@
 
 #include "libglabels-private.h"
 
-#include "xml.h"
+#include "lgl-xml.h"
 
 /*===========================================*/
 /* Private types                             */
diff --git a/libglabels/xml-category.h b/libglabels/lgl-xml-category.h
similarity index 92%
rename from libglabels/xml-category.h
rename to libglabels/lgl-xml-category.h
index acfc5a5..1f535e9 100644
--- a/libglabels/xml-category.h
+++ b/libglabels/lgl-xml-category.h
@@ -1,6 +1,6 @@
 /*
- *  xml-category.h
- *  Copyright (C) 2006-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-category.h
+ *  Copyright (C) 2006-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <libxml/tree.h>
 
-#include "category.h"
+#include "lgl-category.h"
 
 G_BEGIN_DECLS
 
diff --git a/libglabels/xml-paper.c b/libglabels/lgl-xml-paper.c
similarity index 97%
rename from libglabels/xml-paper.c
rename to libglabels/lgl-xml-paper.c
index 00263e7..549f9e8 100644
--- a/libglabels/xml-paper.c
+++ b/libglabels/lgl-xml-paper.c
@@ -1,6 +1,6 @@
 /*
- *  xml-paper.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-paper.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "xml-paper.h"
+#include "lgl-xml-paper.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
@@ -29,7 +29,7 @@
 
 #include "libglabels-private.h"
 
-#include "xml.h"
+#include "lgl-xml.h"
 
 /*===========================================*/
 /* Private types                             */
diff --git a/libglabels/xml-paper.h b/libglabels/lgl-xml-paper.h
similarity index 92%
rename from libglabels/xml-paper.h
rename to libglabels/lgl-xml-paper.h
index 71c3087..e4704c6 100644
--- a/libglabels/xml-paper.h
+++ b/libglabels/lgl-xml-paper.h
@@ -1,6 +1,6 @@
 /*
- *  xml-paper.h
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-paper.h
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <libxml/tree.h>
 
-#include "paper.h"
+#include "lgl-paper.h"
 
 G_BEGIN_DECLS
 
diff --git a/libglabels/xml-template.c b/libglabels/lgl-xml-template.c
similarity index 99%
rename from libglabels/xml-template.c
rename to libglabels/lgl-xml-template.c
index 8e9f5b3..95a2a65 100644
--- a/libglabels/xml-template.c
+++ b/libglabels/lgl-xml-template.c
@@ -1,6 +1,6 @@
 /*
- *  xml-template.c
- *  Copyright (C) 2001-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-template.c
+ *  Copyright (C) 2001-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "xml-template.h"
+#include "lgl-xml-template.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
@@ -29,8 +29,8 @@
 
 #include "libglabels-private.h"
 
-#include "db.h"
-#include "xml.h"
+#include "lgl-db.h"
+#include "lgl-xml.h"
 
 /*===========================================*/
 /* Private types                             */
diff --git a/libglabels/xml-template.h b/libglabels/lgl-xml-template.h
similarity index 94%
rename from libglabels/xml-template.h
rename to libglabels/lgl-xml-template.h
index 3c32349..99b52d3 100644
--- a/libglabels/xml-template.h
+++ b/libglabels/lgl-xml-template.h
@@ -1,6 +1,6 @@
 /*
- *  xml-template.h
- *  Copyright (C) 2001-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-template.h
+ *  Copyright (C) 2001-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <libxml/tree.h>
 
-#include "template.h"
+#include "lgl-template.h"
 
 G_BEGIN_DECLS
 
diff --git a/libglabels/xml-vendor.c b/libglabels/lgl-xml-vendor.c
similarity index 96%
rename from libglabels/xml-vendor.c
rename to libglabels/lgl-xml-vendor.c
index c6ba991..cc44bc8 100644
--- a/libglabels/xml-vendor.c
+++ b/libglabels/lgl-xml-vendor.c
@@ -1,6 +1,6 @@
 /*
- *  xml-vendor.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-vendor.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "xml-vendor.h"
+#include "lgl-xml-vendor.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
@@ -29,7 +29,7 @@
 
 #include "libglabels-private.h"
 
-#include "xml.h"
+#include "lgl-xml.h"
 
 /*===========================================*/
 /* Private types                             */
diff --git a/libglabels/xml-vendor.h b/libglabels/lgl-xml-vendor.h
similarity index 92%
rename from libglabels/xml-vendor.h
rename to libglabels/lgl-xml-vendor.h
index a565eb0..0aac3b7 100644
--- a/libglabels/xml-vendor.h
+++ b/libglabels/lgl-xml-vendor.h
@@ -1,6 +1,6 @@
 /*
- *  xml-vendor.h
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml-vendor.h
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <libxml/tree.h>
 
-#include "vendor.h"
+#include "lgl-vendor.h"
 
 G_BEGIN_DECLS
 
diff --git a/libglabels/xml.c b/libglabels/lgl-xml.c
similarity index 99%
rename from libglabels/xml.c
rename to libglabels/lgl-xml.c
index 4bce17e..8a09019 100644
--- a/libglabels/xml.c
+++ b/libglabels/lgl-xml.c
@@ -1,6 +1,6 @@
 /*
- *  xml.c
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml.c
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "xml.h"
+#include "lgl-xml.h"
 
 #include <glib/gi18n.h>
 #include <glib.h>
diff --git a/libglabels/xml.h b/libglabels/lgl-xml.h
similarity index 96%
rename from libglabels/xml.h
rename to libglabels/lgl-xml.h
index 8b5ba9d..8bae243 100644
--- a/libglabels/xml.h
+++ b/libglabels/lgl-xml.h
@@ -1,6 +1,6 @@
 /*
- *  xml.h
- *  Copyright (C) 2003-2009  Jim Evins <evins snaught com>.
+ *  lgl-xml.h
+ *  Copyright (C) 2003-2010  Jim Evins <evins snaught com>.
  *
  *  This file is part of libglabels.
  *
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <libxml/tree.h>
 
-#include "units.h"
+#include "lgl-units.h"
 
 #define LGL_XML_NAME_SPACE "http://glabels.org/xmlns/2.3/";
 
diff --git a/libglabels/libglabels-private.h b/libglabels/libglabels-private.h
index 726c803..43ea4cd 100644
--- a/libglabels/libglabels-private.h
+++ b/libglabels/libglabels-private.h
@@ -23,8 +23,8 @@
 
 #include <glib.h>
 
-#include "str.h"
-#include "template.h"
+#include "lgl-str.h"
+#include "lgl-template.h"
 
 #undef  G_LOG_DOMAIN
 #define G_LOG_DOMAIN "LibGlabels"
diff --git a/libglabels/libglabels.h b/libglabels/libglabels.h
index 6d45670..222670c 100644
--- a/libglabels/libglabels.h
+++ b/libglabels/libglabels.h
@@ -21,16 +21,16 @@
 #ifndef __LIBGLABELS_H__
 #define __LIBGLABELS_H__
 
-#include <libglabels/db.h>
-#include <libglabels/paper.h>
-#include <libglabels/category.h>
-#include <libglabels/template.h>
-#include <libglabels/units.h>
-#include <libglabels/str.h>
-#include <libglabels/xml-paper.h>
-#include <libglabels/xml-category.h>
-#include <libglabels/xml-template.h>
-#include <libglabels/xml.h>
+#include <libglabels/lgl-db.h>
+#include <libglabels/lgl-paper.h>
+#include <libglabels/lgl-category.h>
+#include <libglabels/lgl-template.h>
+#include <libglabels/lgl-units.h>
+#include <libglabels/lgl-str.h>
+#include <libglabels/lgl-xml-paper.h>
+#include <libglabels/lgl-xml-category.h>
+#include <libglabels/lgl-xml-template.h>
+#include <libglabels/lgl-xml.h>
 
 #endif /* __LIBGLABELS_H__ */
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f1297b..f71c35b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -185,27 +185,27 @@ src/xml-label-04.h
 src/xml-label.c
 src/xml-label.h
 
-libglabels/category.c
-libglabels/category.h
-libglabels/db.c
-libglabels/db.h
+libglabels/lgl-category.c
+libglabels/lgl-category.h
+libglabels/lgl-db.c
+libglabels/lgl-db.h
+libglabels/lgl-paper.c
+libglabels/lgl-paper.h
+libglabels/lgl-str.c
+libglabels/lgl-str.h
+libglabels/lgl-template.c
+libglabels/lgl-template.h
+libglabels/lgl-units.c
+libglabels/lgl-units.h
+libglabels/lgl-xml.c
+libglabels/lgl-xml.h
+libglabels/lgl-xml-category.c
+libglabels/lgl-xml-category.h
+libglabels/lgl-xml-paper.c
+libglabels/lgl-xml-paper.h
+libglabels/lgl-xml-template.c
+libglabels/lgl-xml-template.h
 libglabels/libglabels-private.h
-libglabels/paper.c
-libglabels/paper.h
-libglabels/str.c
-libglabels/str.h
-libglabels/template.c
-libglabels/template.h
-libglabels/units.c
-libglabels/units.h
-libglabels/xml.c
-libglabels/xml.h
-libglabels/xml-category.c
-libglabels/xml-category.h
-libglabels/xml-paper.c
-libglabels/xml-paper.h
-libglabels/xml-template.c
-libglabels/xml-template.h
 
 [type: gettext/glade]data/ui/merge-properties-dialog.ui
 [type: gettext/glade]data/ui/media-select.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]