brasero r604 - in branches/brasero_0_7: . src src/plugins/growisofs

[lmedinas svn gnome org]

Author: lmedinas
Date: Sat Jan 19 20:55:08 2008
New Revision: 604
URL: http://svn.gnome.org/viewvc/brasero?rev=604&view=rev

Log:
Fixes merged from svn trunk.



Removed:
   branches/brasero_0_7/src/inotify-syscalls.h
   branches/brasero_0_7/src/inotify.h
Modified:
   branches/brasero_0_7/ChangeLog
   branches/brasero_0_7/configure.in
   branches/brasero_0_7/src/Makefile.am
   branches/brasero_0_7/src/brasero-audio-disc.c
   branches/brasero_0_7/src/brasero-data-disc.c
   branches/brasero_0_7/src/brasero-disc-copy-dialog.c
   branches/brasero_0_7/src/plugins/growisofs/burn-growisofs.c

Modified: branches/brasero_0_7/configure.in
==============================================================================
--- branches/brasero_0_7/configure.in	(original)
+++ branches/brasero_0_7/configure.in	Sat Jan 19 20:55:08 2008
@@ -4,7 +4,7 @@
 
 BRASERO_MAJOR_VERSION=0
 BRASERO_MINOR_VERSION=7
-BRASERO_SUB=0
+BRASERO_SUB=1
 BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB
 
 AC_SUBST(BRASERO_MAJOR_VERSION)
@@ -106,7 +106,7 @@
 LIBISOFS_REQUIRED=0.2.8
 
 AC_ARG_ENABLE(libburnia,
-			[  --build-libburnia		Build libburnia plugins [[default = yes]]],,
+			[  --enable-libburnia		Build libburnia plugins [[default = yes]]],,
 			[enable_libburnia="yes"])
 
 if test x"$enable_libburnia" = "xyes"; then
@@ -127,21 +127,25 @@
 
 dnl **************** check for cdrtools **********************
 AC_ARG_ENABLE(cdrtools,
-			[  --build-cdrtools		Build cdrtools plugins [[default = yes]]],,
+			[  --enable-cdrtools		Build cdrtools plugins [[default = yes]]],,
 			[build_cdrtools="yes"])
 
 if test x"$build_cdrtools" = "xyes"; then
 	AC_DEFINE(BUILD_CDRTOOLS, 1, [define if you  want to build cdrtools plugins])
+else
+	build_cdrtools="no"
 fi
 AM_CONDITIONAL(BUILD_CDRTOOLS, test x"$build_cdrtools" = "xyes")
 
 dnl **************** check for cdrkit ************************
 AC_ARG_ENABLE(cdrkit,
-			[  --build-cdrkit		Build cdrkit plugins [[default = yes]]],,
+			[  --enable-cdrkit		Build cdrkit plugins [[default = yes]]],,
 			[build_cdrkit="yes"])
 
 if test x"$build_cdrkit" = "xyes"; then
 	AC_DEFINE(BUILD_CDRKIT, 1, [define if you  want to build cdrkit plugins])
+else
+	build_cdrkit="no"
 fi
 AM_CONDITIONAL(BUILD_CDRKIT, test x"$build_cdrkit" = "xyes")
 

Modified: branches/brasero_0_7/src/Makefile.am
==============================================================================
--- branches/brasero_0_7/src/Makefile.am	(original)
+++ branches/brasero_0_7/src/Makefile.am	Sat Jan 19 20:55:08 2008
@@ -58,10 +58,8 @@
 	brasero-disc-copy-dialog.h         \
 	brasero-blank-dialog.c         \
 	brasero-blank-dialog.h         \
-	inotify.h         \
 	brasero-metadata.c         \
 	brasero-metadata.h         \
-	inotify-syscalls.h         \
 	brasero-filtered-window.c         \
 	brasero-filtered-window.h         \
 	brasero-disc.c         \

Modified: branches/brasero_0_7/src/brasero-audio-disc.c
==============================================================================
--- branches/brasero_0_7/src/brasero-audio-disc.c	(original)
+++ branches/brasero_0_7/src/brasero-audio-disc.c	Sat Jan 19 20:55:08 2008
@@ -76,8 +76,9 @@
 #include "eggtreemultidnd.h"
 
 #ifdef BUILD_INOTIFY
-#include "inotify.h"
-#include "inotify-syscalls.h"
+
+#include "sys/inotify.h"
+
 #endif
 
 static void brasero_audio_disc_class_init (BraseroAudioDiscClass *klass);
@@ -3237,7 +3238,7 @@
 		gchar *parent;
 		int dev_fd;
 		char *path;
-		__u32 mask;
+		uint32_t mask;
 		int wd;
 
 		/* we want to be able to catch files being renamed in the same

Modified: branches/brasero_0_7/src/brasero-data-disc.c
==============================================================================
--- branches/brasero_0_7/src/brasero-data-disc.c	(original)
+++ branches/brasero_0_7/src/brasero-data-disc.c	Sat Jan 19 20:55:08 2008
@@ -80,8 +80,7 @@
 
 #ifdef BUILD_INOTIFY
 
-#include "inotify.h"
-#include "inotify-syscalls.h"
+#include "sys/inotify.h"
 
 #endif
 
@@ -12908,9 +12907,9 @@
 brasero_data_disc_start_monitoring_real (BraseroDataDisc *disc,
 					 BraseroFile *file)
 {
-	gchar *path;
+	const gchar *path;
 	gint dev_fd;
-	__u32 mask;
+	uint32_t mask;
 
 	path = gnome_vfs_get_local_path_from_uri (file->uri);
 

Modified: branches/brasero_0_7/src/brasero-disc-copy-dialog.c
==============================================================================
--- branches/brasero_0_7/src/brasero-disc-copy-dialog.c	(original)
+++ branches/brasero_0_7/src/brasero-disc-copy-dialog.c	Sat Jan 19 20:55:08 2008
@@ -175,8 +175,12 @@
 			valid = FALSE;
 		else
 			valid = TRUE;
-	}
-	else {
+	
+	} else if (brasero_burn_session_is_dest_file (priv->session)) {
+
+	  	valid = TRUE;
+
+	} else {
 		BraseroBurnCaps *caps;
 
 		caps = brasero_burn_caps_get_default ();

Modified: branches/brasero_0_7/src/plugins/growisofs/burn-growisofs.c
==============================================================================
--- branches/brasero_0_7/src/plugins/growisofs/burn-growisofs.c	(original)
+++ branches/brasero_0_7/src/plugins/growisofs/burn-growisofs.c	Sat Jan 19 20:55:08 2008
@@ -592,16 +592,20 @@
 	BraseroGrowisofsPrivate *priv;
 	gchar *standard_error;
 	gboolean res;
+	gchar *prog_name;
 
 	priv = BRASERO_GROWISOFS_PRIVATE (obj);
 
 	/* this code comes from ncb_mkisofs_supports_utf8 */
-	res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", 
-					 NULL,
-					 &standard_error,
-					 NULL, 
-					 NULL);
-	if (res && !g_strrstr (standard_error, "Unknown charset"))
+	
+	prog_name = g_find_program_in_path ("genisoimage");
+        if (prog_name && g_file_test (prog_name, G_FILE_TEST_IS_EXECUTABLE)) {
+	  	res = g_spawn_command_line_sync ("genisoimage -input-charset utf8", NULL, &standard_error, NULL, NULL);
+	} else {
+                res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
+	}
+
+       	if (res && !g_strrstr (standard_error, "Unknown charset"))
 		priv->use_utf8 = TRUE;
 	else
 		priv->use_utf8 = FALSE;