Cleanup some '-Wall' warnings.

diff --git a/libglabels/db.c b/libglabels/db.c
index 6e6d047ff5c2cb24784e4e2e26017b3ef4129a78..daf914c46cb3f9c1dea1a9c0f04e87fba5fe9403 100644 (file)
--- 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 b36fdc29e464a912d4fd66a867584b6002505f57..6856e21958f210c6082ce89ba9684751bcddf5a4 100644 (file)
--- 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 fbda823050f614913a9a69638bd66755a3553212..cbdc6d627c8b350a3bf6f8616be371fb703b2427 100644 (file)
--- 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 dfef4962c81cd0468c72c47241af7f89e6d91d8f..5a709f68e56a819a11fbe23bb40691b436ba645a 100644 (file)
--- 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);