brasero r2173 - in trunk: . libbrasero-burn

[philippr svn gnome org]

Author: philippr
Date: Sat Mar 28 08:56:07 2009
New Revision: 2173
URL: http://svn.gnome.org/viewvc/brasero?rev=2173&view=rev

Log:
2009-03-28  Philippe Rouquier  <bonfire-app wanadoo fr>

	Fix #576564 â brasero crashed with SIGSEGV in brasero_image_format_get_cdrdao_size()
        Fix crash when retrieving cue size for cdrdao files (wrong pointer used)
	Fix some build problems due to wrong headers

	* libbrasero-burn/brasero-progress.c:
	* libbrasero-burn/brasero-tray.c:
	* libbrasero-burn/burn-image-format.c
	(brasero_image_format_get_FILE_info):
	* src/brasero-utils.c (brasero_error_quark), (brasero_utils_init),
	(brasero_utils_launch_app):
	* src/brasero-utils.h:

Modified:
   trunk/ChangeLog
   trunk/libbrasero-burn/brasero-progress.c
   trunk/libbrasero-burn/brasero-tray.c
   trunk/libbrasero-burn/burn-image-format.c

Modified: trunk/libbrasero-burn/brasero-progress.c
==============================================================================
--- trunk/libbrasero-burn/brasero-progress.c	(original)
+++ trunk/libbrasero-burn/brasero-progress.c	Sat Mar 28 08:56:07 2009
@@ -40,7 +40,6 @@
 
 #include <gtk/gtk.h>
 
-#include "brasero-utils.h"
 #include "brasero-progress.h"
 #include "burn-basics.h"
 #include "brasero-medium.h"

Modified: trunk/libbrasero-burn/brasero-tray.c
==============================================================================
--- trunk/libbrasero-burn/brasero-tray.c	(original)
+++ trunk/libbrasero-burn/brasero-tray.c	Sat Mar 28 08:56:07 2009
@@ -38,7 +38,6 @@
 #include <gtk/gtk.h>
 
 #include "burn-basics.h"
-#include "brasero-utils.h"
 #include "brasero-tray.h"
 
 static void brasero_tray_icon_class_init (BraseroTrayIconClass *klass);

Modified: trunk/libbrasero-burn/burn-image-format.c
==============================================================================
--- trunk/libbrasero-burn/burn-image-format.c	(original)
+++ trunk/libbrasero-burn/burn-image-format.c	Sat Mar 28 08:56:07 2009
@@ -329,14 +329,13 @@
 }
 
 static gboolean
-brasero_image_format_get_FILE_info (gchar *uri,
+brasero_image_format_get_FILE_info (const gchar *ptr,
 				    GFile *parent,
 				    gint64 *size_img,
 				    GError **error)
 {
 	gchar *path = NULL;
 	gint64 start = 0;
-	const gchar *ptr;
 	GFileInfo *info;
 	GFile *file;
 	gchar *tmp;