2008-11-15 Jim Evins <evins@snaught.com>

	* libglabels/db.c: (lgl_db_register_template):
	* libglabels/xml-template.c:
	(lgl_xml_template_parse_template_node):
	* src/glabels-batch.c:
	* src/view-text.c: (gl_view_text_create_button_press_event):
		Fixed several issues such as possible use of uninitialized variables found with "-O1 -Wall".

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@795 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index ad24cce1cddde6c6ff0d55f3e2ff0fb9bb4e3faf..bda5b1333ea7cd586a61d752de768553a87c882e 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-15  Jim Evins  <evins@snaught.com>
+
+       * libglabels/db.c: (lgl_db_register_template):
+       * libglabels/xml-template.c:
+       (lgl_xml_template_parse_template_node):
+       * src/glabels-batch.c:
+       * src/view-text.c: (gl_view_text_create_button_press_event):
+               Fixed several issues such as possible use of uninitialized variables found with "-O1 -Wall".
+
 2008-11-09  Jim Evins  <evins@snaught.com>
 
        * data/templates/misc-iso-templates.xml:

diff --git a/glabels2/libglabels/db.c b/glabels2/libglabels/db.c
index 28f227c5fa6e89bd66dec26c6e95b42f25e0a6c0..a72790471531f1aa5d75b03685edf21a16ca7a5e 100644 (file)
--- a/glabels2/libglabels/db.c
+++ b/glabels2/libglabels/db.c
@@ -1095,7 +1095,6 @@ lgl_db_register_template (const lglTemplate *template)
                 }
                 else
                 {
-                        lgl_template_free (template_copy);
                         return LGL_DB_REG_FILE_WRITE_ERROR;
                 }
        }

diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c
index e4442bec532fbb56139f5e965d92a677be79625d..6f1ae4b852ee5458d6bfde57bf7c3c8f9ae7ae97 100644 (file)
--- a/glabels2/libglabels/xml-template.c
+++ b/glabels2/libglabels/xml-template.c
@@ -251,6 +251,8 @@ lgl_xml_template_parse_template_node (const xmlNodePtr template_node)
                        page_width  = paper->width;
                        page_height = paper->height;
                } else {
+                       page_width  = 612;
+                       page_height = 792;
                        g_message (_("Unknown page size id or name \"%s\""),
                                   paper_id);
                }

diff --git a/glabels2/src/glabels-batch.c b/glabels2/src/glabels-batch.c
index 61e9c9765abb3a5434bbef76791b80926519fa07..41ebf9d657d75f837a441d86a9b76299e7205810 100644 (file)
--- a/glabels2/src/glabels-batch.c
+++ b/glabels2/src/glabels-batch.c
@@ -33,6 +33,7 @@
 #include "print-op.h"
 #include <libglabels/db.h>
 #include "util.h"
+#include "prefs.h"
 #include "debug.h"
 
 /*============================================*/

diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c
index bca4048b70e8fdf60d370e902ecc581304332eb6..ca930129b54083540776740fcfe8f7799e80889e 100644 (file)
--- a/glabels2/src/view-text.c
+++ b/glabels2/src/view-text.c
@@ -465,7 +465,6 @@ gl_view_text_create_button_press_event   (glView *view,
                                           gdouble y)
 {
        GObject             *object;
-        glViewObject        *view_text;
        GList               *lines;
        gchar               *family;
        glColorNode         *color_node;