brasero r1483 - in trunk: . src src/plugins/checksum src/plugins/local-track

[philippr svn gnome org]

Author: philippr
Date: Thu Nov  6 16:22:37 2008
New Revision: 1483
URL: http://svn.gnome.org/viewvc/brasero?rev=1483&view=rev

Log:
	Fix warnings

	* src/burn-mkisofs-base.c (brasero_mkisofs_base_write_excluded):
	* src/plugins/checksum/burn-checksum-files.c
	(brasero_checksum_files_create_checksum):
	* src/plugins/local-track/burn-local-image.c
	(brasero_local_track_translate_uri):
	* src/plugins/local-track/burn-uri.c (brasero_burn_uri_thread),
	(brasero_burn_uri_start_if_found):

Modified:
   trunk/ChangeLog
   trunk/src/burn-mkisofs-base.c
   trunk/src/plugins/checksum/burn-checksum-files.c
   trunk/src/plugins/local-track/burn-local-image.c
   trunk/src/plugins/local-track/burn-uri.c

Modified: trunk/src/burn-mkisofs-base.c
==============================================================================
--- trunk/src/burn-mkisofs-base.c	(original)
+++ trunk/src/burn-mkisofs-base.c	Thu Nov  6 16:22:37 2008
@@ -131,7 +131,7 @@
 	if (uri && uri [0] == '/') {
 		localpath = g_strdup (unescaped_uri);
 	}
-	else if (g_str_has_prefix (uri, "file://")) {
+	else if (uri && g_str_has_prefix (uri, "file://")) {
 		gchar *unescaped_uri;
 
 		unescaped_uri = g_uri_unescape_string (uri, NULL);

Modified: trunk/src/plugins/checksum/burn-checksum-files.c
==============================================================================
--- trunk/src/plugins/checksum/burn-checksum-files.c	(original)
+++ trunk/src/plugins/checksum/burn-checksum-files.c	Thu Nov  6 16:22:37 2008
@@ -606,7 +606,9 @@
 		/* get the current and future paths */
 		/* FIXME: graft->uri can be path or URIs ... This should be
 		 * fixed for graft points. */
-		if (graft->uri && graft->uri [0] == '/')
+		if (!graft->uri)
+			path = NULL;
+		else if (graft->uri [0] == '/')
 			path = g_strdup (graft->uri);
 		else if (g_str_has_prefix (graft->uri, "file://"))
 			path = g_filename_from_uri (graft->uri, NULL, NULL);

Modified: trunk/src/plugins/local-track/burn-local-image.c
==============================================================================
--- trunk/src/plugins/local-track/burn-local-image.c	(original)
+++ trunk/src/plugins/local-track/burn-local-image.c	Thu Nov  6 16:22:37 2008
@@ -351,7 +351,7 @@
 
 	priv = BRASERO_LOCAL_TRACK_PRIVATE (self);
 
-	if (uri == NULL)
+	if (!uri)
 		return NULL;
 
 	/* see if it is a local file */

Modified: trunk/src/plugins/local-track/burn-uri.c
==============================================================================
--- trunk/src/plugins/local-track/burn-uri.c	(original)
+++ trunk/src/plugins/local-track/burn-uri.c	Thu Nov  6 16:22:37 2008
@@ -319,7 +319,7 @@
 
 		uri = src->data;
 
-		if (g_str_has_prefix (uri, "burn://"))
+		if (uri && g_str_has_prefix (uri, "burn://"))
 			continue;
 
 		uri = g_strdup (uri);
@@ -379,7 +379,7 @@
 				 GError **error)
 {
 	/* Find any graft point with burn:// URI */
-	if (!g_str_has_prefix (uri, "burn://"))
+	if (uri && !g_str_has_prefix (uri, "burn://"))
 		return BRASERO_BURN_NOT_RUNNING;
 
 	BRASERO_JOB_LOG (self, "burn:// URI found %s", uri);