From 2a7ee0716fe13af5ab444193e2017be1931db342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 10 Sep 2009 12:02:21 +0200
Subject: [PATCH] videomeasure: Fix format strings and include correct i18n
 header

---
 gst/videomeasure/gstvideomeasure.c           | 2 ++
 gst/videomeasure/gstvideomeasure_collector.c | 6 +++---
 gst/videomeasure/gstvideomeasure_ssim.c      | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gst/videomeasure/gstvideomeasure.c b/gst/videomeasure/gstvideomeasure.c
index 9cbfb60ef1..34b227a851 100644
--- a/gst/videomeasure/gstvideomeasure.c
+++ b/gst/videomeasure/gstvideomeasure.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <gst/gst-i18n-plugin.h>
+
 #include "gstvideomeasure.h"
 #include "gstvideomeasure_ssim.h"
 #include "gstvideomeasure_collector.h"
diff --git a/gst/videomeasure/gstvideomeasure_collector.c b/gst/videomeasure/gstvideomeasure_collector.c
index 7a7edb03a7..306b3c0bf6 100644
--- a/gst/videomeasure/gstvideomeasure_collector.c
+++ b/gst/videomeasure/gstvideomeasure_collector.c
@@ -32,7 +32,7 @@
 #include "config.h"
 #endif
 
-#include "../../gst-libs/gst/gst-i18n-plugin.h"
+#include <gst/gst-i18n-plugin.h>
 
 #include "gstvideomeasure_collector.h"
 
@@ -262,7 +262,7 @@ gst_measure_collector_save_csv (GstMeasureCollector * mc)
     const gchar *fieldname;
     fieldname = gst_structure_nth_field_name (str, j);
     if (G_LIKELY (j > 0))
-      fprintf (file, ";", fieldname);
+      fprintf (file, ";");
     fprintf (file, "%s", fieldname);
   }
 
@@ -273,7 +273,7 @@ gst_measure_collector_save_csv (GstMeasureCollector * mc)
       const gchar *fieldname;
       fieldname = gst_structure_nth_field_name (str, j);
       if (G_LIKELY (j > 0))
-        fprintf (file, ";", fieldname);
+        fprintf (file, ";");
       if (G_LIKELY (g_value_transform (gst_structure_get_value (str, fieldname),
                   &tmp)))
         fprintf (file, "%s", g_value_get_string (&tmp));
diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c
index 7a0d0ed0e9..36041a1a63 100644
--- a/gst/videomeasure/gstvideomeasure_ssim.c
+++ b/gst/videomeasure/gstvideomeasure_ssim.c
@@ -1216,13 +1216,13 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
 bad_name:
   {
     g_warning ("gstssim: request new pad with bad name %s (must be "
-        "'modified\%d')\n", padname);
+        "'modified')\n", padname);
     return NULL;
   }
 unnamed_pad:
   {
     g_warning ("gstssim: request new pad without a name (must be "
-        "'modified\%d')\n");
+        "'modified')\n");
     return NULL;
   }
 not_sink: