[Goodies-commits] r6469 - xfburn/trunk/xfburn

[David Mohr]

Author: squisher
Date: 2009-01-16 04:23:44 +0000 (Fri, 16 Jan 2009)
New Revision: 6469

Modified:
   xfburn/trunk/xfburn/xfburn-transcoder-basic.c
   xfburn/trunk/xfburn/xfburn-transcoder-gst.c
   xfburn/trunk/xfburn/xfburn-utils.c
Log:
Applying -Werror=format-security patch by Tomasz Pawe?\197?\130 Gajc

Modified: xfburn/trunk/xfburn/xfburn-transcoder-basic.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-basic.c	2009-01-15 19:17:13 UTC (rev 6468)
+++ xfburn/trunk/xfburn/xfburn-transcoder-basic.c	2009-01-16 04:23:44 UTC (rev 6469)
@@ -334,6 +334,7 @@
   if (atrack->src == NULL) {
     g_warning ("Could not create burn_source from %s!", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
+		 "%s",
                  _(errormsg_libburn_setup));
     return NULL;
   }
@@ -343,6 +344,7 @@
   if (burn_track_set_source (track, atrack->src) != BURN_SOURCE_OK) {
     g_warning ("Could not add source to track %s!", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
+		 "%s",
                  _(errormsg_libburn_setup));
                  
     return NULL;

Modified: xfburn/trunk/xfburn/xfburn-transcoder-gst.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-gst.c	2009-01-15 19:17:13 UTC (rev 6468)
+++ xfburn/trunk/xfburn/xfburn-transcoder-gst.c	2009-01-16 04:23:44 UTC (rev 6469)
@@ -287,6 +287,7 @@
   if (!pipeline || !source || !decoder || !conv || !sink) {
     g_warning ("A pipeline element could not be created");
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_CREATION,
+		    "%s",
                  _(errormsg_gst_setup));
     return;
   }
@@ -295,6 +296,7 @@
   if (!id) {
     g_warning ("The debug identity element could not be created");
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_CREATION,
+		    "%s",
                  _(errormsg_gst_setup));
     return;
   }
@@ -331,6 +333,7 @@
 #endif
     g_warning ("Could not setup filtered gstreamer link");
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_CREATION,
+		    "%s",
                  _(errormsg_gst_setup));
     gst_caps_unref (caps);
     return;
@@ -690,6 +693,7 @@
 
     priv->is_audio = FALSE;
     g_set_error (&(priv->error), XFBURN_ERROR, XFBURN_ERROR_GST_NO_AUDIO,
+		    "%s",
                  _(error_msg));
     
     msg_struct = gst_structure_new ("no-audio-content", NULL);
@@ -840,7 +844,7 @@
   struct burn_source *src_fifo;
 
   if (pipe (pipe_fd) != 0) {
-    g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_PIPE, g_strerror (errno));
+    g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_PIPE, "%s", g_strerror (errno));
     return NULL;
   }
 
@@ -852,6 +856,7 @@
   if (atrack->src == NULL) {
     g_warning ("Could not create burn_source from %s.", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
+		 "%s",
                  _(errormsg_libburn_setup));
     XFBURN_AUDIO_TRACK_DELETE_DATA (atrack);
     atrack->fd = -1;
@@ -871,6 +876,7 @@
   if (burn_track_set_source (track, atrack->src) != BURN_SOURCE_OK) {
     g_warning ("Could not add source to track %s.", atrack->inputfile);
     g_set_error (error, XFBURN_ERROR, XFBURN_ERROR_BURN_SOURCE,
+		 "%s",
                  _(errormsg_libburn_setup));
     XFBURN_AUDIO_TRACK_DELETE_DATA (atrack);
     burn_source_free (atrack->src);

Modified: xfburn/trunk/xfburn/xfburn-utils.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-utils.c	2009-01-15 19:17:13 UTC (rev 6468)
+++ xfburn/trunk/xfburn/xfburn-utils.c	2009-01-16 04:23:44 UTC (rev 6469)
@@ -154,8 +154,9 @@
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   type,
                                   GTK_BUTTONS_YES_NO,
+                                  "%s",
                                   primary_text);
-  gtk_message_dialog_format_secondary_text (dialog, secondary_text);
+  gtk_message_dialog_format_secondary_text (dialog, "%s", secondary_text);
   ret = gtk_dialog_run (GTK_DIALOG (dialog));
   switch (ret) {
     case GTK_RESPONSE_YES: