From 5bd9bc4fc3b3ab019b8e290d7ae48bd3a63cd320 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Thu, 9 Dec 2010 23:39:48 -0500
Subject: [PATCH] Cleanup some '-Wall' warnings.

---
 libglabels/db.c     | 3 ++-
 src/color-swatch.c  | 2 --
 src/font-sample.c   | 2 --
 src/label-barcode.c | 4 ----
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/libglabels/db.c b/libglabels/db.c
index 6e6d047f..daf914c4 100644
--- a/libglabels/db.c
+++ b/libglabels/db.c
@@ -24,6 +24,7 @@
 
 #include <glib/gi18n.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -1567,7 +1568,7 @@ lgl_db_delete_template_by_name (const gchar *name)
 
                 if (!g_file_test (abs_filename, G_FILE_TEST_EXISTS))
                 {
-                        g_message ("File \"%s\" does not exist.  Cannot delete it.");
+                        g_message ("File \"%s\" does not exist.  Cannot delete template.", abs_filename);
                         return LGL_DB_DELETE_DOES_NOT_EXIST;
                 }
 
diff --git a/src/color-swatch.c b/src/color-swatch.c
index b36fdc29..6856e219 100644
--- a/src/color-swatch.c
+++ b/src/color-swatch.c
@@ -192,8 +192,6 @@ static gboolean
 draw_cb (GtkWidget      *widget,
          cairo_t        *cr)
 {
-        GtkAllocation  allocation;
-
 	draw_swatch (GL_COLOR_SWATCH (widget), cr);
 
 	return FALSE;
diff --git a/src/font-sample.c b/src/font-sample.c
index fbda8230..cbdc6d62 100644
--- a/src/font-sample.c
+++ b/src/font-sample.c
@@ -183,8 +183,6 @@ static gboolean
 draw_cb (GtkWidget      *widget,
          cairo_t        *cr)
 {
-        GtkAllocation  allocation;
-
 	draw_sample (GL_FONT_SAMPLE (widget), cr);
 
 	return FALSE;
diff --git a/src/label-barcode.c b/src/label-barcode.c
index dfef4962..5a709f68 100644
--- a/src/label-barcode.c
+++ b/src/label-barcode.c
@@ -545,7 +545,6 @@ draw_object (glLabelObject *object,
                 else
                 {
                         lgl_barcode_render_to_cairo (lbc->priv->display_gbc, cr);
-                        lgl_barcode_free (gbc);
                 }
 
         }
@@ -569,10 +568,7 @@ object_at (glLabelObject *object,
 {
         glLabelBarcode       *lbc     = (glLabelBarcode *)object;
         gdouble               w, h;
-        lglBarcode           *gbc;
-        glLabelBarcodeStyle  *style;
         glTextNode           *text_node;
-        gchar                *text;
         gdouble               scale_x, scale_y;
 
         gl_label_object_get_size (object, &w, &h);
-- 
2.39.5