From d94c47da20d726831e16f8cd720d64d26ce85d2b Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 2 Mar 2010 21:47:27 -0500 Subject: [PATCH] Minor Cleanup --- COPYING.README_FIRST | 7 ++++--- README | 11 ++++++----- configure.ac | 2 +- libglabels/xml-template.c | 4 +--- libglabels/xml-vendor.c | 2 -- src/cairo-label-path.c | 2 ++ src/cairo-markup-path.c | 4 +++- src/label-line.c | 2 +- src/label-text.c | 2 -- src/template-designer.c | 3 +++ templates/avery-iso-templates.xml | 28 --------------------------- templates/avery-other-templates.xml | 28 --------------------------- templates/avery-us-templates.xml | 28 --------------------------- templates/brother-other-templates.xml | 28 --------------------------- templates/categories.xml | 28 --------------------------- templates/dymo-other-templates.xml | 28 --------------------------- templates/maco-us-templates.xml | 28 --------------------------- templates/misc-iso-templates.xml | 28 --------------------------- templates/misc-other-templates.xml | 28 --------------------------- templates/misc-us-templates.xml | 28 --------------------------- templates/paper-sizes.xml | 28 --------------------------- templates/uline-us-templates.xml | 28 --------------------------- templates/vendors.xml | 28 --------------------------- templates/worldlabel-us-templates.xml | 28 --------------------------- templates/zweckform-iso-templates.xml | 28 --------------------------- 25 files changed, 21 insertions(+), 438 deletions(-) diff --git a/COPYING.README_FIRST b/COPYING.README_FIRST index 06eea6d5..00513224 100644 --- a/COPYING.README_FIRST +++ b/COPYING.README_FIRST @@ -31,6 +31,7 @@ TEMPLATE DATABASE: The XML files in the "templates/" subdirectory constitute the glabels label database. No copyright is claimed on the facts contained within - the database. However, to clear up any ambiguity, the files themselves - are licensed using the MIT/X license -- see 'COPYING-TEMPLATES' in this - directory for details. + the database and can be used for any purpose. However, to clear up any + ambiguity, the DTD file that defines the format of these files is + licensed using the MIT/X license, as close to public domain as one can + get -- see 'COPYING-TEMPLATES' in this directory for details. diff --git a/README b/README index aadf2453..abb14683 100644 --- a/README +++ b/README @@ -3,10 +3,11 @@ Copyright Copyright (C) 2001-2009 Jim Evins - gLabels contains components copyrighted by others -- see the 'AUTHORS' file in - this directory. + gLabels contains components copyrighted by others -- see the 'AUTHORS' file + in this directory. - For license information see the 'COPYING.README_FIRST' file in this directory. + For license information see the 'COPYING.README_FIRST' file in this + directory. @@ -36,8 +37,8 @@ Evolution Data Server 2.28.0+ Optional Barcode Backends ========================= GNU Barcode 0.98+ (http://www.gnu.org/software/barcode/barcode.html) -QREncode 3.1.0+ (http://megaui.net/fukuchi/works/qrencode/index.en.html) -IEC16022 0.2.4+ (http://datenfreihafen.org/projects/iec16022.html) +QREncode 3.1.0+ (http://megaui.net/fukuchi/works/qrencode/index.en.html) +IEC16022 0.2.4+ (http://datenfreihafen.org/projects/iec16022.html) diff --git a/configure.ac b/configure.ac index ec3665b4..d58f8a53 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.63) -AC_INIT([glabels],[2.3.pre0svn],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116]) +AC_INIT([glabels],[2.3.pre0git],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116]) AC_CONFIG_SRCDIR(src/glabels.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff --git a/libglabels/xml-template.c b/libglabels/xml-template.c index 75b6fec4..50ae1329 100644 --- a/libglabels/xml-template.c +++ b/libglabels/xml-template.c @@ -110,7 +110,6 @@ lgl_xml_template_read_templates_from_file (const gchar *utf8_filename) { gchar *filename; xmlDocPtr templates_doc; - GList *templates = NULL; LIBXML_TEST_VERSION; @@ -400,7 +399,6 @@ xml_parse_label_ellipse_node (xmlNodePtr label_node, lglTemplate *template) { gchar *id; - gchar *tmp; gdouble waste; gdouble w, h; lglTemplateFrame *frame; @@ -682,7 +680,7 @@ static void xml_parse_markup_ellipse_node (xmlNodePtr markup_node, lglTemplateFrame *frame) { - gdouble x1, y1, w, h, r; + gdouble x1, y1, w, h; xmlNodePtr node; x1 = lgl_xml_get_prop_length (markup_node, "x1", 0); diff --git a/libglabels/xml-vendor.c b/libglabels/xml-vendor.c index 153f935f..c6ba9911 100644 --- a/libglabels/xml-vendor.c +++ b/libglabels/xml-vendor.c @@ -148,8 +148,6 @@ lgl_xml_vendor_parse_vendor_node (xmlNodePtr vendor_node) { lglVendor *vendor; gchar *name; - gchar *url; - LIBXML_TEST_VERSION; diff --git a/src/cairo-label-path.c b/src/cairo-label-path.c index 0c8de525..9b63aee0 100644 --- a/src/cairo-label-path.c +++ b/src/cairo-label-path.c @@ -24,6 +24,8 @@ #include +#include "cairo-ellipse-path.h" + #include "debug.h" diff --git a/src/cairo-markup-path.c b/src/cairo-markup-path.c index 78e8a6d0..90ba1888 100644 --- a/src/cairo-markup-path.c +++ b/src/cairo-markup-path.c @@ -24,6 +24,8 @@ #include +#include "cairo-ellipse-path.h" + #include "debug.h" @@ -204,7 +206,7 @@ gl_cairo_markup_margin_ellipse_path (cairo_t *cr, { const lglTemplate *template; const lglTemplateFrame *frame; - gdouble w, h, r, m; + gdouble w, h, m; gl_debug (DEBUG_PATH, "START"); diff --git a/src/label-line.c b/src/label-line.c index 30ee7cff..0b58815c 100644 --- a/src/label-line.c +++ b/src/label-line.c @@ -208,7 +208,7 @@ set_line_color (glLabelObject *object, { if ( checkpoint ) { - gl_label_object_get_parent (GL_LABEL_OBJECT (lline)); + label = gl_label_object_get_parent (GL_LABEL_OBJECT (lline)); gl_label_checkpoint (label, _("Line color")); } diff --git a/src/label-text.c b/src/label-text.c index 56270b43..7e6a39cf 100644 --- a/src/label-text.c +++ b/src/label-text.c @@ -447,8 +447,6 @@ static void buffer_changed_cb (GtkTextBuffer *textbuffer, glLabelText *ltext) { - glLabel *label; - ltext->priv->size_changed = TRUE; gl_label_object_emit_changed (GL_LABEL_OBJECT(ltext)); diff --git a/src/template-designer.c b/src/template-designer.c index 95b2162a..4f2498cb 100644 --- a/src/template-designer.c +++ b/src/template-designer.c @@ -1739,6 +1739,9 @@ build_template (glTemplateDesigner *dialog) w/upp, h/upp, waste/upp); break; + default: + g_assert_not_reached (); + break; } lgl_template_add_frame (template, frame); diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml index 1e413872..433e255e 100644 --- a/templates/avery-iso-templates.xml +++ b/templates/avery-iso-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/avery-other-templates.xml b/templates/avery-other-templates.xml index a068b8c3..bb21ef64 100644 --- a/templates/avery-other-templates.xml +++ b/templates/avery-other-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/avery-us-templates.xml b/templates/avery-us-templates.xml index f2da6806..3f208203 100644 --- a/templates/avery-us-templates.xml +++ b/templates/avery-us-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/brother-other-templates.xml b/templates/brother-other-templates.xml index 7175f7bb..1c6bc83d 100644 --- a/templates/brother-other-templates.xml +++ b/templates/brother-other-templates.xml @@ -1,33 +1,5 @@ - - - diff --git a/templates/dymo-other-templates.xml b/templates/dymo-other-templates.xml index 49592b50..62c0bd99 100644 --- a/templates/dymo-other-templates.xml +++ b/templates/dymo-other-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/maco-us-templates.xml b/templates/maco-us-templates.xml index 6054e5f4..d48acbd5 100644 --- a/templates/maco-us-templates.xml +++ b/templates/maco-us-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml index b24c8188..ba2d1057 100644 --- a/templates/misc-iso-templates.xml +++ b/templates/misc-iso-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/misc-other-templates.xml b/templates/misc-other-templates.xml index b1a1c968..00f385c7 100644 --- a/templates/misc-other-templates.xml +++ b/templates/misc-other-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/misc-us-templates.xml b/templates/misc-us-templates.xml index 4df17aca..85b66acd 100644 --- a/templates/misc-us-templates.xml +++ b/templates/misc-us-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/paper-sizes.xml b/templates/paper-sizes.xml index 2d5ac68f..e1049d8e 100644 --- a/templates/paper-sizes.xml +++ b/templates/paper-sizes.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/uline-us-templates.xml b/templates/uline-us-templates.xml index f9eca6ee..4fe1246e 100644 --- a/templates/uline-us-templates.xml +++ b/templates/uline-us-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/vendors.xml b/templates/vendors.xml index dd8b3cf7..f4a2faf7 100644 --- a/templates/vendors.xml +++ b/templates/vendors.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/worldlabel-us-templates.xml b/templates/worldlabel-us-templates.xml index 6898a212..1af2198f 100644 --- a/templates/worldlabel-us-templates.xml +++ b/templates/worldlabel-us-templates.xml @@ -1,33 +1,5 @@ - - diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml index e177230f..0b334f3c 100644 --- a/templates/zweckform-iso-templates.xml +++ b/templates/zweckform-iso-templates.xml @@ -1,33 +1,5 @@ - - -- 2.39.5