brasero r1413 - in trunk: . data docs po src src/plugins/libburnia

[philippr svn gnome org]

Author: philippr
Date: Thu Oct 23 15:58:47 2008
New Revision: 1413
URL: http://svn.gnome.org/viewvc/brasero?rev=1413&view=rev

Log:
	Fix #555860 â Brasero fails make distcheck

	* Makefile.am:
	* data/Makefile.am:
	* docs/Makefile.am:
	* src/Makefile.am:
	* src/brasero-io.c (brasero_io_check_symlink_target),
	(brasero_io_get_file_info_thread_real),
	(brasero_io_get_file_info_thread),
	(brasero_io_parse_playlist_thread),
	(brasero_io_load_directory_thread):
	* src/plugins/libburnia/burn-libread-disc.c:


Removed:
   trunk/src/plugins/libburnia/burn-libread-disc.c
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/data/Makefile.am
   trunk/docs/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip
   trunk/src/Makefile.am
   trunk/src/brasero-io.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Oct 23 15:58:47 2008
@@ -13,6 +13,9 @@
 	MAINTAINERS		\
 	NEWS			\
 	README			\
+	intltool-extract.in	\
+	intltool-merge.in	\
+	intltool-update.in	\
 	gnome-doc-utils.make	\
 	m4
 

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Oct 23 15:58:47 2008
@@ -27,11 +27,14 @@
 
 IMAGES=	logo.png
 
-CLEANFILES =	$(desktop_DATA)\
-			$(mime_DATA)
-
-EXTRA_DIST = $(desktop_in_files)\
-			$(MIMEFILES)\
+CLEANFILES =		$(desktop_DATA)		\
+			$(mime_DATA)		\
+			$(schemas_DATA)
+
+EXTRA_DIST = 		brasero.xml		\
+			$(desktop_in_files)	\
+			$(schemas_in_files)	\
+			$(MIMEFILES)		\
 			$(IMAGES)
 
 braserodistpixdir = $(datadir)/brasero/

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Thu Oct 23 15:58:47 2008
@@ -1 +1,2 @@
 man_MANS = brasero.1
+EXTRA_DIST =	$(man_MANS)

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Oct 23 15:58:47 2008
@@ -67,7 +67,6 @@
 src/plugins/libburnia/burn-libburn.c
 src/plugins/libburnia/burn-libburn-common.c
 src/plugins/libburnia/burn-libisofs.c
-src/plugins/libburnia/burn-libread-disc.c
 src/plugins/local-track/burn-local-image.c
 src/plugins/transcode/burn-normalize.c
 src/plugins/transcode/burn-transcode.c

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Thu Oct 23 15:58:47 2008
@@ -1 +1,13 @@
 data/brasero.desktop.in
+data/brasero-copy-medium.desktop.in
+data/brasero-open-image.desktop.in
+data/brasero-open-playlist.desktop.in
+data/brasero-open-project.desktop.in
+data/brasero-copy-medium.desktop.in
+data/brasero-open-image.desktop.in
+data/brasero-open-playlist.desktop.in
+data/brasero-open-project.desktop.in
+data/brasero-copy-medium.desktop.in
+data/brasero-open-image.desktop.in
+data/brasero-open-playlist.desktop.in
+data/brasero-open-project.desktop.in

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Oct 23 15:58:47 2008
@@ -17,6 +17,7 @@
 	$(BRASERO_CFLAGS)						\
 	$(BRASERO_LIBXML_CFLAGS)
 
+EXTRA_DIST = brasero-marshal.list
 CLEANFILES = $(RECMARSHALFILES)
 
 AM_CFLAGS = -g

Modified: trunk/src/brasero-io.c
==============================================================================
--- trunk/src/brasero-io.c	(original)
+++ trunk/src/brasero-io.c	Thu Oct 23 15:58:47 2008
@@ -684,12 +684,12 @@
 
 static gboolean
 brasero_io_check_symlink_target (GFile *parent,
-				 GFileInfo *info,
-				 const gchar *escaped_uri)
+				 GFileInfo *info)
 {
 	const gchar *target;
 	gchar *target_uri;
 	guint size;
+	gchar *uri;
 
 	target = g_file_info_get_symlink_target (info);
     	if (!target)
@@ -702,11 +702,15 @@
 	/* we check for circular dependency here :
 	 * if the target is one of the parent of symlink */
 	size = strlen (target_uri);
-	if (!strncmp (target_uri, escaped_uri, size)
-	&& (*(escaped_uri + size) == '/' || *(escaped_uri + size) == '\0')) {
+	uri = g_file_get_uri (parent);
+
+	if (!strncmp (target_uri, uri, size)
+	&& (*(uri + size) == '/' || *(uri + size) == '\0')) {
 		g_free (target_uri);
+		g_free (uri);
 		return FALSE;
 	}
+	g_free (uri);
 
 	g_file_info_set_symlink_target (info, target_uri);
 	g_free (target_uri);
@@ -952,7 +956,7 @@
 static GFileInfo *
 brasero_io_get_file_info_thread_real (BraseroAsyncTaskManager *manager,
 				      GCancellable *cancel,
-				      const gchar *uri,
+				      GFile *file,
 				      BraseroIOFlags options,
 				      GError **error)
 {
@@ -963,7 +967,6 @@
 				  G_FILE_ATTRIBUTE_STANDARD_TYPE};
 	GError *local_error = NULL;
 	GFileInfo *info;
-	GFile *file;
 
 	if (g_cancellable_is_cancelled (cancel))
 		return NULL;
@@ -980,7 +983,6 @@
 	if (options & BRASERO_IO_INFO_METADATA)
 		strcat (attributes, "," G_FILE_ATTRIBUTE_STANDARD_SIZE);
 
-	file = g_file_new_for_uri (uri);
 	info = g_file_query_info (file,
 				  attributes,
 				  G_FILE_QUERY_INFO_NONE,	/* follow symlinks */
@@ -1002,19 +1004,17 @@
 								 file,
 								 cancel,
 								 error);
-			g_object_unref (file);
 			if (!res)
 				return NULL;
 
 			return brasero_io_get_file_info_thread_real (manager,
 								     cancel,
-								     uri,
+								     file,
 								     options,
 								     error);
 		}
 
 		g_propagate_error (error, local_error);
-		g_object_unref (file);
 		return NULL;
 	}
 
@@ -1022,7 +1022,7 @@
 		GFile *parent;
 
 		parent = g_file_get_parent (file);
-		if (!brasero_io_check_symlink_target (parent, info, uri)) {
+		if (!brasero_io_check_symlink_target (parent, info)) {
 			g_set_error (error,
 				     BRASERO_ERROR,
 				     BRASERO_ERROR_SYMLINK_LOOP,
@@ -1035,7 +1035,6 @@
 		}
 		g_object_unref (parent);
 	}
-	g_object_unref (file);
 
 	/* see if we are supposed to get metadata for this file (provided it's
 	 * an audio file of course). */
@@ -1043,7 +1042,9 @@
 	&&  options & BRASERO_IO_INFO_METADATA) {
 		BraseroMetadataInfo metadata = { NULL };
 		gboolean result;
+		gchar *uri;
 
+		uri = g_file_get_uri (file);
 		result = brasero_io_get_metadata_info (BRASERO_IO (manager),
 						       cancel,
 						       uri,
@@ -1051,6 +1052,7 @@
 						       ((options & BRASERO_IO_INFO_METADATA_MISSING_CODEC) ? BRASERO_METADATA_FLAG_MISSING : 0) |
 						       ((options & BRASERO_IO_INFO_METADATA_SNAPSHOT) ? BRASERO_METADATA_FLAG_SNAPHOT : 0),
 						       &metadata);
+		g_free (uri);
 
 		if (result)
 			brasero_io_set_metadata_attributes (info, &metadata);
@@ -1070,6 +1072,7 @@
 	gchar *file_uri = NULL;
 	GError *error = NULL;
 	GFileInfo *info;
+	GFile *file;
 
 	if (job->options & BRASERO_IO_INFO_CHECK_PARENT_SYMLINK) {
 		/* If we want to make sure a directory is not added twice we have to make sure
@@ -1087,15 +1090,22 @@
 		return BRASERO_ASYNC_TASK_FINISHED;
 	}
 
+	file = g_file_new_for_uri (file_uri?file_uri:job->uri);
 	info = brasero_io_get_file_info_thread_real (manager,
 						     cancel,
-						     file_uri?file_uri:job->uri,
+						     file,
 						     job->options,
 						     &error);
 
+	/* do this to have a very nice URI:
+	 * for example: file://pouet instead of file://../directory/pouet */
+	g_free (file_uri);
+	file_uri = g_file_get_uri (file);
+	g_object_unref (file);
+
 	brasero_io_return_result (BRASERO_IO (manager),
 				  job->base,
-				  file_uri?file_uri:job->uri,
+				  file_uri,
 				  info,
 				  error,
 				  job->callback_data);
@@ -1281,6 +1291,7 @@
 	 * Reverse order of list to get a correct order for entries. */
 	data.uris = g_slist_reverse (data.uris);
 	for (iter = data.uris; iter; iter = iter->next) {
+		GFile *file;
 		gchar *child;
 		GFileInfo *child_info;
 
@@ -1288,11 +1299,13 @@
 		if (g_cancellable_is_cancelled (cancel))
 			break;
 
+		file = g_file_new_for_uri (child);
 		child_info = brasero_io_get_file_info_thread_real (manager,
 								   cancel,
-								   child,
+								   file,
 								   job->options,
 								   NULL);
+		g_object_unref (file);
 
 		if (!child_info)
 			continue;
@@ -1857,7 +1870,7 @@
 
 		/* special case for symlinks */
 		if (g_file_info_get_is_symlink (info)) {
-			if (!brasero_io_check_symlink_target (file, info, child_uri)) {
+			if (!brasero_io_check_symlink_target (file, info)) {
 				error = g_error_new (BRASERO_ERROR,
 						     BRASERO_ERROR_SYMLINK_LOOP,
 						     _("recursive symbolic link"));