[brasero/gnome-2-30] Fix #621243 - Brasero reports outdated cdrtools on cdrtools-3.00 Fix how we parse strings from cdre



commit 9649a737619849f7816ed7154338462dc65bd28e
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Fri Jun 11 21:40:02 2010 +0200

    Fix #621243  - Brasero reports outdated cdrtools on cdrtools-3.00
    Fix how we parse strings from cdrecord --version to support new version

 plugins/cdrtools/burn-cdda2wav.c |    4 ++--
 plugins/cdrtools/burn-cdrecord.c |    4 ++--
 plugins/cdrtools/burn-mkisofs.c  |    4 ++--
 plugins/cdrtools/burn-readcd.c   |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/plugins/cdrtools/burn-cdda2wav.c b/plugins/cdrtools/burn-cdda2wav.c
index 94209b9..c0cd657 100644
--- a/plugins/cdrtools/burn-cdda2wav.c
+++ b/plugins/cdrtools/burn-cdda2wav.c
@@ -457,11 +457,11 @@ brasero_plugin_check_config (BraseroPlugin *plugin)
 	 * As for the version checking, it becomes impossible given that with
 	 * icedax the string would not start with cdda2wav. So ... */
 	/*
-	gint version [3] = { 2, 0, 0};
+	gint version [3] = { 2, 0, -1};
 	brasero_plugin_test_app (plugin,
 	                         "cdda2wav",
 	                         "--version",
-	                         "cdda2wav %d.%d.%da64 (x86_64-unknown-linux-gnu) Copyright (C) 1993-2004 Heiko Ei�feldt (C) 2004-2009 J�rg Schilling",
+	                         "cdda2wav %d.%d",
 	                         version);
 	*/
 }
diff --git a/plugins/cdrtools/burn-cdrecord.c b/plugins/cdrtools/burn-cdrecord.c
index a32536f..8602b83 100644
--- a/plugins/cdrtools/burn-cdrecord.c
+++ b/plugins/cdrtools/burn-cdrecord.c
@@ -1438,10 +1438,10 @@ brasero_cdrecord_export_caps (BraseroPlugin *plugin)
 G_MODULE_EXPORT void
 brasero_plugin_check_config (BraseroPlugin *plugin)
 {
-	gint version [3] = { 2, 0, 0};
+	gint version [3] = { 2, 0, -1};
 	brasero_plugin_test_app (plugin,
 	                         "cdrecord",
 	                         "--version",
-	                         "Cdrecord-ProDVD-ProBD-Clone %d.%d.%da64 (x86_64-unknown-linux-gnu) Copyright (C) 1995-2009 J�rg Schilling",
+	                         "Cdrecord-ProDVD-ProBD-Clone %d.%d",
 	                         version);
 }
diff --git a/plugins/cdrtools/burn-mkisofs.c b/plugins/cdrtools/burn-mkisofs.c
index 136d9f5..dd9da23 100644
--- a/plugins/cdrtools/burn-mkisofs.c
+++ b/plugins/cdrtools/burn-mkisofs.c
@@ -588,10 +588,10 @@ brasero_mkisofs_export_caps (BraseroPlugin *plugin)
 G_MODULE_EXPORT void
 brasero_plugin_check_config (BraseroPlugin *plugin)
 {
-	gint version [3] = { 2, 0, 0};
+	gint version [3] = { 2, 0, -1};
 	brasero_plugin_test_app (plugin,
 	                         "mkisofs",
 	                         "--version",
-	                         "mkisofs %d.%d.%da64 (x86_64-unknown-linux-gnu) Copyright (C) 1993-1997 Eric Youngdale (C) 1997-2009 J�rg Schilling",
+	                         "mkisofs %d.%d",
 	                         version);
 }
diff --git a/plugins/cdrtools/burn-readcd.c b/plugins/cdrtools/burn-readcd.c
index db89054..47476f1 100644
--- a/plugins/cdrtools/burn-readcd.c
+++ b/plugins/cdrtools/burn-readcd.c
@@ -506,10 +506,10 @@ brasero_readcd_export_caps (BraseroPlugin *plugin)
 G_MODULE_EXPORT void
 brasero_plugin_check_config (BraseroPlugin *plugin)
 {
-	gint version [3] = { 2, 0, 0};
+	gint version [3] = { 2, 0, -1};
 	brasero_plugin_test_app (plugin,
 	                         "readcd",
 	                         "--version",
-	                         "readcd %d.%d.%da64 (x86_64-unknown-linux-gnu) Copyright (C) 1987, 1995-2009 J�rg Schilling",
+	                         "readcd %d.%d",
 	                         version);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]