From b4abc77732a4daf5ada4cd4da0f945453380db7e Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 16 Nov 2008 03:59:46 +0000 Subject: [PATCH] 2008-11-15 Jim Evins * 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 --- glabels2/ChangeLog | 9 +++++++++ glabels2/libglabels/db.c | 1 - glabels2/libglabels/xml-template.c | 2 ++ glabels2/src/glabels-batch.c | 1 + glabels2/src/view-text.c | 1 - 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index ad24cce1..bda5b133 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,12 @@ +2008-11-15 Jim Evins + + * 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 * data/templates/misc-iso-templates.xml: diff --git a/glabels2/libglabels/db.c b/glabels2/libglabels/db.c index 28f227c5..a7279047 100644 --- 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 e4442bec..6f1ae4b8 100644 --- 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 61e9c976..41ebf9d6 100644 --- a/glabels2/src/glabels-batch.c +++ b/glabels2/src/glabels-batch.c @@ -33,6 +33,7 @@ #include "print-op.h" #include #include "util.h" +#include "prefs.h" #include "debug.h" /*============================================*/ diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c index bca4048b..ca930129 100644 --- 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; -- 2.39.5