[Goodies-commits] r5206 - in xfburn/trunk: . xfburn

[David Mohr]

Author: squisher
Date: 2008-08-06 22:27:53 +0000 (Wed, 06 Aug 2008)
New Revision: 5206

Modified:
   xfburn/trunk/configure.in.in
   xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c
Log:
Bumping required libburn version up to 0.4.2

Modified: xfburn/trunk/configure.in.in
===================================================================
--- xfburn/trunk/configure.in.in	2008-08-06 18:13:31 UTC (rev 5205)
+++ xfburn/trunk/configure.in.in	2008-08-06 22:27:53 UTC (rev 5206)
@@ -3,7 +3,7 @@
 dnl Version information
 m4_define([xfburn_version_major], [0])
 m4_define([xfburn_version_minor], [3])
-m4_define([xfburn_version_micro], [1])
+m4_define([xfburn_version_micro], [3])
 m4_define([xfburn_version_build], [@REVISION@])
 m4_define([xfburn_version_tag], [svn])
 m4_define([xfburn_version], [xfburn_version_major().xfburn_version_minor().xfburn_version_micro()ifelse(xfburn_version_tag(), [svn], [xfburn_version_tag()-xfburn_version_build()], [xfburn_version_tag()])])
@@ -29,7 +29,7 @@
 XDT_I18N([@LINGUAS@])
 
 dnl check for required packages
-XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.3.0])
+XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.4.2])
 XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.6.2])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])

Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c	2008-08-06 18:13:31 UTC (rev 5205)
+++ xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c	2008-08-06 22:27:53 UTC (rev 5206)
@@ -446,6 +446,7 @@
   glong size = 0;
   glong written = 0;
   guint i = 0;
+  int (*read_fn) (struct burn_source *src, unsigned char *buf, int size);
 
   fd = open (params->iso_path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
   if (fd == -1) {
@@ -465,8 +466,13 @@
   xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing ISO..."));
 
   size = (glong) params->src->get_size (params->src);
+  if (params->src->read == NULL)
+    read_fn = params->src->read_xt;
+  else
+    read_fn = params->src->read;
+
   /* FIXME: is size really always 2048? */
-  while (params->src->read_xt (params->src, buf, 2048) == 2048) {
+  while (read_fn (params->src, buf, 2048) == 2048) {
     if (write (fd, buf, 2048) < 2048) {
       /* an error occured while writing */
       gchar err[256];